Index: branches/5.0.x/core/units/sections/sections_config.php
===================================================================
diff -u -r12382 -r12389
--- branches/5.0.x/core/units/sections/sections_config.php	(.../sections_config.php)	(revision 12382)
+++ branches/5.0.x/core/units/sections/sections_config.php	(.../sections_config.php)	(revision 12389)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: sections_config.php 12382 2009-08-25 18:27:07Z alex $
+* @version	$Id: sections_config.php 12389 2009-08-26 09:30:14Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -73,7 +73,7 @@
 				'label'			=>	'la_tab_Reviews',
 				'url'			=>	Array ('t' => 'reviews/reviews', 'pass' => 'm'),
 				'permissions'	=>	Array ('view'),
-				'priority'		=>	3.3,
+				'priority'		=>	3.5,
 				'type'			=>	stTREE,
 			),
 
Index: branches/5.0.x/core/units/categories/categories_tag_processor.php
===================================================================
diff -u -r12382 -r12389
--- branches/5.0.x/core/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 12382)
+++ branches/5.0.x/core/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 12389)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: categories_tag_processor.php 12382 2009-08-25 18:27:07Z alex $
+* @version	$Id: categories_tag_processor.php 12389 2009-08-26 09:30:14Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -1348,7 +1348,7 @@
 		$ret .= '<script type="text/javascript" src="' . $js_url . '/jquery/thickbox/thickbox.js"></script>' . "\n";
 		$ret .= '<script type="text/javascript" src="' . $js_url . '/template_manager.js"></script>' . "\n";
 		$ret .= '<script language="javascript">' . "\n";
-		$ret .= "TB.pathToImage = 'js/jquery/thickbox/loadingAnimation.gif';" . "\n";
+		$ret .= "TB.pathToImage = '" . $js_url . "/jquery/thickbox/loadingAnimation.gif';" . "\n";
 
 		$template = $this->Application->GetVar('t');
 		$theme_id = $this->Application->GetVar('m_theme');
Index: branches/5.0.x/core/admin_templates/incs/grid_blocks.tpl
===================================================================
diff -u -r12382 -r12389
--- branches/5.0.x/core/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 12382)
+++ branches/5.0.x/core/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 12389)
@@ -532,14 +532,22 @@
 <inp2:m_DefineElement name="grid_column_title_html" no_special="0">
 	<table style="width: auto" class="layout-only-table"><tr>
 		<td style="vertical-align: middle; padding: 0px">
-			<a href="javascript:resort_grid('<inp2:m_param name="PrefixSpecial"/>','<inp2:m_param name="sort_field"/>', <inp2:m_param name="ajax"/>);"
-				class="columntitle_small" title="<inp2:m_phrase name="la_col_SortBy" html_escape="1"/> <inp2:m_if check="m_ParamEquals" name="use_phrases" value="1"><inp2:m_phrase name="$title"/><inp2:m_else/><inp2:m_param name="title"/></inp2:m_if>"<IMG alt="" src="img/list_arrow_<inp2:{$PrefixSpecial}_order field="$sort_field" no_special='$no_special'/>.gif" width="15" height="15" border="0" align="absmiddle">
+			<a
+				href="javascript:resort_grid('<inp2:m_param name="PrefixSpecial"/>','<inp2:m_param name="sort_field"/>', <inp2:m_param name="ajax"/>);"
+				class="columntitle_small"
+				title="<inp2:m_Phrase name='la_col_SortBy' no_editing='1' html_escape='1'/> <inp2:m_if check='m_Param' name='use_phrases'><inp2:m_Phrase name='$title' no_editing='1' html_escape='1'/><inp2:m_else/><inp2:m_Param name='title'/></inp2:m_if>">
+					<img
+						alt="<inp2:m_Phrase name='la_col_SortBy' no_editing='1' html_escape='1'/> <inp2:m_if check='m_Param' name='use_phrases'><inp2:m_Phrase name='$title' no_editing='1' html_escape='1'/><inp2:m_else/><inp2:m_Param name='title'/></inp2:m_if>"
+						src="img/list_arrow_<inp2:Order field='$sort_field' no_special='$no_special'/>.gif" width="15" height="15" border="0" align="absmiddle"
+					/>
 			</a>
 		</td>
 		<td style="vertical-align: middle; text-align: left; padding: 1px; white-space: normal">
-			<a href="javascript:resort_grid('<inp2:m_param name="PrefixSpecial"/>','<inp2:m_param name="sort_field"/>', <inp2:m_param name="ajax"/>);"
-				class="columntitle_small" title="<inp2:m_phrase name="la_col_SortBy" html_escape="1"/> <inp2:m_if check="m_ParamEquals" name="use_phrases" value="1"><inp2:m_phrase name="$title"/><inp2:m_else/><inp2:m_param name="title"/></inp2:m_if>">
-				<inp2:m_if check="m_ParamEquals" name="use_phrases" value="1"><inp2:m_phrase name="$title"/><inp2:m_else/><inp2:m_param name="title"/></inp2:m_if>
+			<a
+				href="javascript:resort_grid('<inp2:m_param name="PrefixSpecial"/>','<inp2:m_param name="sort_field"/>', <inp2:m_param name="ajax"/>);"
+				class="columntitle_small"
+				title="<inp2:m_Phrase name='la_col_SortBy' no_editing='1' html_escape='1'/> <inp2:m_if check='m_Param' name='use_phrases'><inp2:m_Phrase name='$title' no_editing='1' html_escape='1'/><inp2:m_else/><inp2:m_Param name='title'/></inp2:m_if>">
+				<inp2:m_if check="m_Param" name="use_phrases"><inp2:m_Phrase name="$title"/><inp2:m_else/><inp2:m_Param name="title"/></inp2:m_if>
 			</a>
 		</td>
 	</tr></table>
Index: branches/5.0.x/core/kernel/languages/phrases_cache.php
===================================================================
diff -u -r12345 -r12389
--- branches/5.0.x/core/kernel/languages/phrases_cache.php	(.../phrases_cache.php)	(revision 12345)
+++ branches/5.0.x/core/kernel/languages/phrases_cache.php	(.../phrases_cache.php)	(revision 12389)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: phrases_cache.php 12345 2009-08-18 11:13:10Z alex $
+* @version	$Id: phrases_cache.php 12389 2009-08-26 09:30:14Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -163,10 +163,11 @@
 		$this->OriginalIds = $ids;
 	}
 
-	function AddCachedPhrase($label, $value)
+	function AddCachedPhrase($label, $value, $allow_editing = true)
 	{
-		$label = mb_strtoupper($label);
-		$this->Phrases[$label] = $value;
+		$cache_key = ($allow_editing ? '' : 'NE:') . $label;
+
+		$this->Phrases[$cache_key] = $value;
 	}
 
 	function NeedsCacheUpdate()
@@ -206,7 +207,7 @@
 		}
 
 		if (ereg("^!.+!$", $label) > 0) {
-			$label = substr($label, 1, -1); //cut exclamation marks
+			$label = substr($label, 1, -1); // cut exclamation marks
 		}
 
 		if (strlen($label) == 0) {
@@ -216,9 +217,11 @@
 		$original_label = $label;
 		$label = mb_strtoupper($label);
 
-		if (array_key_exists($label, $this->Phrases)) {
-			$translated_label = $this->Phrases[$label];
+		$cache_key = ($allow_editing ? '' : 'NE:') . $label;
 
+		if (array_key_exists($cache_key, $this->Phrases)) {
+			$translated_label = $this->Phrases[$cache_key];
+
 			if ($this->_editExisting && $allow_editing && !array_key_exists($label, $this->_missingPhrases)) {
 				// option to change translation for Labels
 				$edit_url = 'javascript:translate_phrase(\'' . addslashes($original_label) . '\', \'' . $this->_phraseEditTemplate . '\', {event: \'OnPrepareUpdate\', simple_mode: ' . ($this->_simpleEditingMode ? 'true' : 'false') . '});';
@@ -239,9 +242,10 @@
 
 	function LoadPhraseByLabel($label, $original_label, $allow_editing = true)
 	{
+		// bug: MySQL don't use index on Phrase column, when function is used on it's value (e.g. UPPER, like in this case)
 		$sql = 'SELECT PhraseId, Translation
 				FROM ' . TABLE_PREFIX . 'Phrase
-				WHERE (LanguageId = ' . $this->LanguageId . ') AND (UPPER(Phrase) = UPPER(' . $this->Conn->qstr($label) . '))';
+				WHERE (LanguageId = ' . $this->LanguageId . ') AND (UPPER(Phrase) = ' . $this->Conn->qstr($label) . ')';
 		$res = $this->Conn->GetRow($sql);
 
 		if ($res === false || count($res) == 0) {
@@ -259,14 +263,17 @@
 			}
 
 			// add it as already cached, as long as we dont need to cache not found phrase
-			$this->AddCachedPhrase($label, $translation);
+			$this->AddCachedPhrase($label, $translation, $allow_editing);
 
 			return false;
 		}
 
-		$this->Phrases[$label] = $res['Translation'];
+		$cache_key = ($allow_editing ? '' : 'NE:') . $label;
+		$this->Phrases[$cache_key] = $res['Translation'];
+
 		array_push($this->Ids, $res['PhraseId']);
-		$this->Ids = array_unique($this->Ids); //just to make sure
+		$this->Ids = array_unique($this->Ids); // just to make sure
+
 		return true;
 	}