From 5563f3e137d5dbdb22346294ddefd0d5005eaf92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 17 Feb 2016 10:59:40 +0100 Subject: [PATCH] Revert "Remove sql data parameter" This reverts commit 84c12c2fddc52374a6358cbe4a8140675b553b7f. --- libraries/plugins/import/ImportSql.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libraries/plugins/import/ImportSql.php b/libraries/plugins/import/ImportSql.php index 2367cfc7016a..8926830ed77a 100644 --- a/libraries/plugins/import/ImportSql.php +++ b/libraries/plugins/import/ImportSql.php @@ -100,9 +100,11 @@ protected function setProperties() /** * Handles the whole import logic * + * @param array &$sql_data 2-element array with sql data + * * @return void */ - public function doImport() + public function doImport(&$sql_data = array()) { global $error, $timeout_passed; @@ -153,19 +155,19 @@ public function doImport() } // Executing the query. - PMA_importRunQuery($statement, $statement); + PMA_importRunQuery($statement, $statement, $sql_data); } // Extracting remaining statements. while ((!$error) && (!$timeout_passed) && (!empty($bq->query))) { $statement = $bq->extract(true); if (!empty($statement)) { - PMA_importRunQuery($statement, $statement); + PMA_importRunQuery($statement, $statement, $sql_data); } } // Finishing. - PMA_importRunQuery('', ''); + PMA_importRunQuery('', '', $sql_data); } /**