Index: branches/RC/core/kernel/processors/main_processor.php =================================================================== diff -u -r9277 -r9527 --- branches/RC/core/kernel/processors/main_processor.php (.../main_processor.php) (revision 9277) +++ branches/RC/core/kernel/processors/main_processor.php (.../main_processor.php) (revision 9527) @@ -473,9 +473,16 @@ function Phrase($params) { // m:phrase name="phrase_name" default="Tr-alala" updated="2004-01-29 12:49" - if (array_key_exists('default', $params)) return $params['default']; //backward compatibility - $translation = $this->Application->Phrase($this->SelectParam($params, 'label,name,title')); + $phrase_name = $this->SelectParam($params, 'label,name,title'); + if (isset($params['source']) && $params['source']) { + $phrase_name = $this->Application->GetVar($phrase_name); + if (array_key_exists('default', $params) && !$phrase_name) { + $phrase_name = $params['default']; + } + } + $translation = $this->Application->Phrase($phrase_name); + if (isset($params['escape']) && $params['escape']) { $translation = htmlspecialchars($translation, ENT_QUOTES); $translation = addslashes($translation);