From 63dfb7fad3b423469ec82a1338652d40912bd5fe Mon Sep 17 00:00:00 2001 From: Ben Thomson Date: Sun, 30 Dec 2018 16:35:17 +0800 Subject: [PATCH] Replace deprecated prepareModel call in ImportExport behavior --- modules/backend/behaviors/ImportExportController.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/backend/behaviors/ImportExportController.php b/modules/backend/behaviors/ImportExportController.php index a84a203d1..d54e90e6d 100644 --- a/modules/backend/behaviors/ImportExportController.php +++ b/modules/backend/behaviors/ImportExportController.php @@ -210,7 +210,7 @@ class ImportExportController extends ControllerBehavior catch (Exception $ex) { $this->controller->handleError($ex); } - + $this->vars['sourceIndexOffset'] = $this->getImportSourceIndexOffset($importOptions['firstRowTitles']); return $this->importExportMakePartial('import_result_form'); @@ -334,7 +334,7 @@ class ImportExportController extends ControllerBehavior return $firstRow; } - + /** * Get the index offset to add to the reported row number in status messages * @@ -627,8 +627,8 @@ class ImportExportController extends ControllerBehavior ? 'getColumnValueRaw' : 'getColumnValue'; - $model = $widget->prepareModel(); - $results = $model->get(); + $query = $widget->prepareQuery(); + $results = $query->get(); foreach ($results as $result) { $record = []; foreach ($columns as $column) {