Index: branches/5.1.x/core/units/helpers/multilanguage_helper.php =================================================================== diff -u -N -r13086 -r13545 --- branches/5.1.x/core/units/helpers/multilanguage_helper.php (.../multilanguage_helper.php) (revision 13086) +++ branches/5.1.x/core/units/helpers/multilanguage_helper.php (.../multilanguage_helper.php) (revision 13545) @@ -1,6 +1,6 @@ Application->UnitConfigReader->loadConfig($regs[1]); - $this->Application->HandleEvent( new kEvent($prefix.':OnAfterConfigRead') ); + $this->Application->UnitConfigReader->runAfterConfigRead($prefix); } $table_name = $this->Application->getUnitOption($prefix, 'TableName'); @@ -226,7 +226,7 @@ $ret = $this->scanTable('/^l[\d]+_'.preg_quote($field_name, '/').'$/'); if (!$ret) { // no multilingual fields at all (but we have such field without language prefix) - $original_found = $this->scanTable('/'.preg_quote($field_name, '/').'/'); + $original_found = $this->scanTable('/^'.preg_quote($field_name, '$/').'/'); $this->curSourceField = $original_found ? $field_name : false; } else {