Index: branches/5.2.x/core/kernel/db/db_tag_processor.php =================================================================== diff -u -N -r15137 -r15152 --- branches/5.2.x/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 15137) +++ branches/5.2.x/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 15152) @@ -1,6 +1,6 @@ getObject($params); + $object = $this->getObject($params); return $object->GetID() <= 0; } @@ -608,7 +608,7 @@ */ protected function PreviousResource($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $list_helper = $this->Application->recallObject('ListHelper'); @@ -629,7 +629,7 @@ */ protected function NextResource($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $list_helper = $this->Application->recallObject('ListHelper'); @@ -880,7 +880,7 @@ $params['no_special'] = 'no_special'; } - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ if (array_key_exists('db', $params) && $params['db']) { @@ -984,7 +984,7 @@ $field = $this->SelectParam($params, 'name,field'); if ($field) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $timestamp = $object->GetDBField($field); @@ -1053,7 +1053,7 @@ { // - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $dst_field = $this->SelectParam($params, 'name,field'); @@ -1081,7 +1081,7 @@ function Error($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $field = $this->SelectParam($params, 'name,field'); @@ -1092,7 +1092,7 @@ function HasError($params) { if ($params['field'] == 'any') { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $skip_fields = array_key_exists('except', $params) ? $params['except'] : false; @@ -1138,7 +1138,7 @@ function IsRequired($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $field = $params['field']; @@ -1156,7 +1156,7 @@ function FieldOption($params) { - $object =& $this->getObject($params);; + $object = $this->getObject($params);; $options = $object->GetFieldOptions($params['field']); $ret = isset($options[$params['option']]) ? $options[$params['option']] : ''; if (isset($params['as_label']) && $params['as_label']) $ret = $this->Application->ReplaceLanguageTags($ret); @@ -1172,7 +1172,7 @@ */ protected function PredefinedOptions($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBList */ $field = $params['field']; @@ -1272,7 +1272,7 @@ $field = $this->SelectParam($params, 'name,field'); if ( !isset($object) ) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ } @@ -1532,7 +1532,7 @@ */ function prepareInputName($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $field = $this->SelectParam($params, 'name,field'); @@ -1599,7 +1599,7 @@ } if (isset($params['value'])) { - $object =& $this->getObject($params); + $object = $this->getObject($params); $field_modifiers[$field][$params['type']] = $params['value']; $object->ApplyFieldModifiers($field_modifiers); } @@ -1745,13 +1745,13 @@ function SaveEvent($params) { // SaveEvent is set during OnItemBuild, but we may need it before any other tag calls OnItemBuild - $object =& $this->getObject($params); + $object = $this->getObject($params); return $this->Application->GetVar($this->getPrefixSpecial().'_SaveEvent'); } function NextId($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); $wid = $this->Application->GetTopmostWid($this->Prefix); $session_name = rtrim($this->getPrefixSpecial().'_selected_ids_'.$wid, '_'); @@ -1768,7 +1768,7 @@ function PrevId($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); $wid = $this->Application->GetTopmostWid($this->Prefix); $session_name = rtrim($this->getPrefixSpecial().'_selected_ids_'.$wid, '_'); @@ -1807,7 +1807,7 @@ */ function FieldEquals($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ return $object->GetDBField( $this->SelectParam($params, 'name,field') ) == $params['value']; @@ -1882,7 +1882,7 @@ return $icons['default']; } - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBList */ $icon = ''; @@ -2087,7 +2087,7 @@ */ function ConfigFormElement($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $field = $params['field']; @@ -2155,7 +2155,7 @@ function CustomFieldLabel($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); $field = $this->SelectParam($params, 'name,field'); @@ -2365,13 +2365,13 @@ * @access public * @return kDBItem|kDBList */ - function &getObject($params = Array()) + function getObject($params = Array()) { $object = $this->Application->recallObject($this->getPrefixSpecial(), $this->Prefix, $params); /* @var $object kDBItem */ if ( isset($params['requery']) && $params['requery'] ) { - $this->Application->HandleEvent($q_event, $this->getPrefixSpecial() . ':LoadItem', $params); + $this->Application->HandleEvent(new kEvent($this->getPrefixSpecial() . ':LoadItem', $params)); } return $object; @@ -2385,7 +2385,7 @@ */ function PropertyEquals($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); $property_name = $this->SelectParam($params, 'name,var,property'); return $object->$property_name == $params['value']; } @@ -2404,7 +2404,7 @@ $ret = ''; if ($selected_ids) { $selected_ids = explode(',', $selected_ids); - $object =& $this->getObject( kUtil::array_merge_recursive($params, Array('skip_autoload' => true)) ); + $object = $this->getObject( kUtil::array_merge_recursive($params, Array('skip_autoload' => true)) ); $params['name'] = $params['render_as']; foreach ($selected_ids as $id) { $object->Load($id); @@ -2651,7 +2651,7 @@ function IsNewItem($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); return $object->IsNewItem(); } @@ -2664,7 +2664,7 @@ */ protected function ItemLink($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ if ( !isset($params['pass']) ) { @@ -2691,7 +2691,7 @@ function PrintSerializedFields($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $field = $this->SelectParam($params, 'field'); @@ -2832,7 +2832,7 @@ $logo_filename = isset($params['LogoFilename']) ? $params['LogoFilename'] : false; $logo_h_margin = isset($params['LogoHMargin']) ? $params['LogoHMargin'] : false; $logo_v_margin = isset($params['LogoVMargin']) ? $params['LogoVMargin'] : false; - $object =& $this->getObject($params); + $object = $this->getObject($params); $field = $this->SelectParam($params, 'name,field'); return $object->GetField($field, 'resize:'.$max_width.'x'.$max_height.';wm:'.$logo_filename.'|'.$logo_h_margin.'|'.$logo_v_margin); @@ -2975,7 +2975,7 @@ */ function Selected($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $field = $this->SelectParam($params, 'name,field'); @@ -2998,7 +2998,7 @@ */ protected function OptionValue($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $value = $params['value']; @@ -3030,7 +3030,7 @@ $prefix = $this->getPrefixSpecial(); if ( $this->Application->hasObject( $this->getPrefixSpecial() ) ) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ if ( $object->getFormName() != $form_name ) { @@ -3046,7 +3046,7 @@ return ''; } - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ return $object->getFormName(); @@ -3063,7 +3063,7 @@ { $params['requery'] = 1; - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ return '';