Index: trunk/core/units/phrases/phrases_event_handler.php =================================================================== diff -u -r1563 -r1859 --- trunk/core/units/phrases/phrases_event_handler.php (.../phrases_event_handler.php) (revision 1563) +++ trunk/core/units/phrases/phrases_event_handler.php (.../phrases_event_handler.php) (revision 1859) @@ -11,17 +11,18 @@ { parent::OnNew($event); $label = $this->Application->GetVar('phrases_label'); + $this->Application->setUnitOption($event->Prefix,'AutoLoad',false); + + $object =& $event->getObject( $label ? Array('live_table'=>true) : Array() ); if($label) { - $this->Application->setUnitOption($event->Prefix,'AutoLoad',false); - $object =& $event->getObject( Array('live_table'=>true) ); $object->SetDBField('Phrase',$label); $object->SetDBField('LanguageId', $this->Application->GetVar('m_lang') ); $object->SetDBField('PhraseType',1); - - $last_module = $this->Application->GetVar('last_module'); - if($last_module) $object->SetDBField('Module', $last_module); } + + $last_module = $this->Application->GetVar('last_module'); + if($last_module) $object->SetDBField('Module', $last_module); } /**