Index: branches/5.2.x/core/kernel/db/dbitem.php =================================================================== diff -u -N -r15130 -r15137 --- branches/5.2.x/core/kernel/db/dbitem.php (.../dbitem.php) (revision 15130) +++ branches/5.2.x/core/kernel/db/dbitem.php (.../dbitem.php) (revision 15137) @@ -1,6 +1,6 @@ validator) ) { $validator_class = $this->Application->getUnitOption($this->Prefix, 'ValidatorClass', 'kValidator'); - $this->validator =& $this->Application->makeClass($validator_class); + $this->validator = $this->Application->makeClass($validator_class); } $this->validator->setDataSource($this); @@ -127,7 +127,7 @@ $formatter = $this->GetFieldOption($field_name, 'formatter'); if ( $formatter ) { - $formatter =& $this->Application->recallObject($formatter); + $formatter = $this->Application->recallObject($formatter); /* @var $formatter kFormatter */ $res = $formatter->Format($value, $field_name, $this, $format); @@ -185,7 +185,7 @@ // kFormatter is always used, to make sure, that numeric value is converted to normal representation // according to regional format, even when formatter is not set (try seting format to 1.234,56 to understand why) - $formatter =& $this->Application->recallObject(isset($options['formatter']) ? $options['formatter'] : 'kFormatter'); + $formatter = $this->Application->recallObject(isset($options['formatter']) ? $options['formatter'] : 'kFormatter'); /* @var $formatter kFormatter */ $parsed = $formatter->Parse($value, $name, $this); @@ -518,7 +518,7 @@ foreach ($this->Fields as $field => $options) { if ( isset($options['formatter']) ) { - $formatter =& $this->Application->recallObject($options['formatter']); + $formatter = $this->Application->recallObject($options['formatter']); /* @var $formatter kFormatter */ $formatter->UpdateMasterFields($field, $this->GetDBField($field), $options, $this); @@ -1041,7 +1041,7 @@ $this->LogChanges($main_prefix, $mode); if (!$this->IsTempTable()) { - $handler =& $this->Application->recallObject($this->Prefix . '_EventHandler'); + $handler = $this->Application->recallObject($this->Prefix . '_EventHandler'); /* @var $handler kDBEventHandler */ $ses_var_name = $main_prefix . '_changes_' . $this->Application->GetTopmostWid($this->Prefix); @@ -1371,17 +1371,17 @@ $cdata_key = rtrim($this->Prefix . '-cdata.' . $this->Special, '.'); - $cdata =& $this->Application->recallObject($cdata_key, null, Array ('skip_autoload' => true)); + $cdata = $this->Application->recallObject($cdata_key, null, Array ('skip_autoload' => true)); /* @var $cdata kDBItem */ $resource_id = $this->GetDBField('ResourceId'); $cdata->Load($resource_id, 'ResourceId'); $cdata->SetDBField('ResourceId', $resource_id); - $ml_formatter =& $this->Application->recallObject('kMultiLanguage'); + $ml_formatter = $this->Application->recallObject('kMultiLanguage'); /* @var $ml_formatter kMultiLanguage */ - $ml_helper =& $this->Application->recallObject('kMultiLanguageHelper'); + $ml_helper = $this->Application->recallObject('kMultiLanguageHelper'); /* @var $ml_helper kMultiLanguageHelper */ $languages = $ml_helper->getLanguages();