Index: branches/5.0.x/core/kernel/languages/phrases_cache.php
===================================================================
diff -u -r12299 -r12320
--- branches/5.0.x/core/kernel/languages/phrases_cache.php	(.../phrases_cache.php)	(revision 12299)
+++ branches/5.0.x/core/kernel/languages/phrases_cache.php	(.../phrases_cache.php)	(revision 12320)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: phrases_cache.php 12299 2009-08-17 01:51:27Z dmitrya $
+* @version	$Id: phrases_cache.php 12320 2009-08-17 10:21:48Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -54,13 +54,6 @@
 	var $_phraseEditTemplate = '';
 
 	/**
-	 * Use popup for phrase editing
-	 *
-	 * @var bool
-	 */
-	var $_usePopups = false;
-
-	/**
 	 * Use simplified form for phrase editing
 	 *
 	 * @var bool
@@ -86,7 +79,6 @@
 
 		// now we use admin phrase editing template even on front-end
 		$this->_phraseEditTemplate = 'regional/phrases_edit';
-		$this->_usePopups = $this->Application->ConfigValue('UsePopups');
 	}
 
 	/**
@@ -222,23 +214,7 @@
 
 			if ($this->_editExisting && $allow_editing) {
 				// option to change translation for Labels
-				if ($this->_usePopups) {
-					// link to popup when using popups (only in admin)
-					$edit_url = 'javascript:translate_phrase(\'' . addslashes($original_label) . '\', \'' . $this->_phraseEditTemplate . '\', {event: \'OnPrepareUpdate\', simple_mode: ' . ($this->_simpleEditingMode ? 'true' : 'false') . '});';
-				}
-				else {
-					// direct link, when not using popups OR on frontend
-					$url_params = Array(
-						'm_opener' => 'd',
-						'phrases_label' => $original_label,
-						'phrases_event' => 'OnPrepareUpdate',
-						'simple_mode' => $this->_simpleEditingMode ? 1 : 0,
-						'pass' => 'all,phrases'
-					);
-
-					$edit_url = $this->Application->HREF($this->_phraseEditTemplate, '', $url_params, 'index.php');
-				}
-
+				$edit_url = 'javascript:translate_phrase(\'' . addslashes($original_label) . '\', \'' . $this->_phraseEditTemplate . '\', {event: \'OnPrepareUpdate\', simple_mode: ' . ($this->_simpleEditingMode ? 'true' : 'false') . '});';
 				$translated_label = '<' . $this->_translateHtmlTag . ' href="' . $edit_url . '" name="cms-translate-phrase" title="Edit translation">' . $translated_label . '</' . $this->_translateHtmlTag . '>';
 
 				if ($this->fromTag) {
@@ -265,23 +241,7 @@
 			$translation = '!' . $label . '!';
 
 			if ($this->_editMissing && $allow_editing) {
-				if ($this->_usePopups) {
-					// link to popup when using popups (only in admin)
-					$edit_url = 'javascript:translate_phrase(\'' . addslashes($original_label) . '\', \'' . $this->_phraseEditTemplate . '\', {event: \'OnNew\', simple_mode: ' . ($this->_simpleEditingMode ? 'true' : 'false') . '});';
-				}
-				else {
-					// direct link, when not using popups OR on frontend
-					$url_params = Array (
-						'm_opener' => 'd',
-						'phrases_label' => $original_label,
-						'phrases_event' => 'OnNew',
-						'simple_mode' => $this->_simpleEditingMode ? 1 : 0,
-						'pass' => 'all,phrases'
-					);
-
-					$edit_url = $this->Application->HREF($this->_phraseEditTemplate, '', $url_params, 'index.php');
-				}
-
+				$edit_url = 'javascript:translate_phrase(\'' . addslashes($original_label) . '\', \'' . $this->_phraseEditTemplate . '\', {event: \'OnNew\', simple_mode: ' . ($this->_simpleEditingMode ? 'true' : 'false') . '});';
 				$translation = '<' . $this->_translateHtmlTag . ' href="' . $edit_url . '" class="cms-translate-phrase" title="Translate">!' . $label . '!</' . $this->_translateHtmlTag . '>';
 
 				if ($this->fromTag) {