Index: branches/5.2.x/core/units/helpers/csv_helper.php =================================================================== diff -u -N -r14870 -r15137 --- branches/5.2.x/core/units/helpers/csv_helper.php (.../csv_helper.php) (revision 14870) +++ branches/5.2.x/core/units/helpers/csv_helper.php (.../csv_helper.php) (revision 15137) @@ -1,6 +1,6 @@ Application->RecallVar('export_rand'); $get_rand = $this->Application->GetVar('export_rand'); - $file_helper =& $this->Application->recallObject('FileHelper'); + $file_helper = $this->Application->recallObject('FileHelper'); /* @var $file_helper FileHelper */ if ( $export_data && $export_rand == $get_rand ) { @@ -51,7 +51,7 @@ $export_data['record_separator'] = $this->separator_mapping[(int)$this->Application->ConfigValue('CSVExportSeparator')]; $export_data['page'] = 1; - $lang_object =& $this->Application->recallObject('lang.current'); + $lang_object = $this->Application->recallObject('lang.current'); /* @var $lang_object LanguagesItem */ $export_data['source_encoding'] = strtoupper($lang_object->GetDBField('Charset')); @@ -69,14 +69,14 @@ $grid_config = $grids[$export_data['grid']]['Fields']; $list_params = Array ('per_page' => $export_data['step'], 'grid' => $export_data['grid']); - $list =& $this->Application->recallObject(rtrim(implode('.', $prefix_elems), '.'), $prefix_elems[0] . '_List', $list_params); + $list = $this->Application->recallObject(rtrim(implode('.', $prefix_elems), '.'), $prefix_elems[0] . '_List', $list_params); /* @var $list kDBList */ $list->SetPage($export_data['page']); $list->Query(); $list->GoFirst(); - $picker_helper =& $this->Application->RecallObject('ColumnPickerHelper'); + $picker_helper = $this->Application->recallObject('ColumnPickerHelper'); /* @var $picker_helper kColumnPickerHelper */ $picker_helper->ApplyPicker(rtrim(implode('.', $prefix_elems), '.'), $grid_config, $export_data['grid']); @@ -186,7 +186,7 @@ $import_data = Array(); - $lang_object =& $this->Application->recallObject('lang.current'); + $lang_object = $this->Application->recallObject('lang.current'); /* @var $lang_object LanguagesItem */ $import_data['source_encoding'] = strtoupper( $lang_object->GetDBField('Charset') ); $import_data['encoding'] = $this->Application->ConfigValue('CSVExportEncoding') ? false : 'UTF-16LE'; @@ -271,7 +271,7 @@ $import_data = unserialize($this->Application->RecallVar('import_data')); $prefix_elems = preg_split('/\.|_/', $import_data['prefix'], 2); - $object =& $this->Application->recallObject($prefix_elems[0].'.-csvimport', $prefix_elems[0], Array('skip_autoload' => true, 'populate_ml_fields' => true)); + $object = $this->Application->recallObject($prefix_elems[0].'.-csvimport', $prefix_elems[0], Array('skip_autoload' => true, 'populate_ml_fields' => true)); /* @var $object kDBItem */ $file = fopen($import_data['file'], 'r');