Index: trunk/core/kernel/languages/phrases_cache.php
===================================================================
diff -u -N -r4880 -r4940
--- trunk/core/kernel/languages/phrases_cache.php	(.../phrases_cache.php)	(revision 4880)
+++ trunk/core/kernel/languages/phrases_cache.php	(.../phrases_cache.php)	(revision 4940)
@@ -105,8 +105,22 @@
 		$label = strtoupper($label);
 		if(isset($this->Phrases[$label])) {
 			$translated_label = $this->Phrases[$label];
-			if (defined('DEBUG_MODE') && DEBUG_MODE && constOn('DBG_PHRASES_HIGHLIGHT') && !$this->Application->IsAdmin()) {
-				$translated_label = '<span style="border: 1px solid #999999; background-color: #cccccc; color: #999999; ">'.$translated_label.'</span></a> <span style="color: red; background-color:#ffffcc">'.$original_label.'</span>';
+			// debug mode is checked directly to improve performance
+			if (defined('DEBUG_MODE') && DEBUG_MODE && constOn('DBG_PHRASES_HIGHLIGHT')) {
+				if (!$this->Application->isDebugMode()) return $translated_label;			
+				
+				if ($this->Application->IsAdmin()) {
+					$sql = 'SELECT Module
+							FROM '.TABLE_PREFIX.'Phrase
+							WHERE (LanguageId = '.$this->LanguageId.') AND (Phrase = '.$this->Conn->qstr($label).')';
+					$this->Application->Debugger->appendHTML('Phrase: <b>'.$label.'</b>; Module: <b>'.$this->Conn->GetOne($sql).'</b>');
+//					$translated_label = $translated_label.' [m: '.$this->Conn->GetOne($sql).'; l: '.$label.']';
+				}
+				else {
+					// highlight text created via translated phrase (used to detect if text on screen is phrase or not)
+					$translated_label = '<span style="border: 1px solid #999999; background-color: #cccccc; color: #999999; ">'.$translated_label.'</span></a> <span style="color: red; background-color:#ffffcc">'.$original_label.'</span>';
+				}
+				
 			}
 			return $translated_label;
 		}