Skip to content

Commit

Permalink
Revert "Remove sql data parameter"
Browse files Browse the repository at this point in the history
This reverts commit 84c12c2.
  • Loading branch information
nijel committed Feb 17, 2016
1 parent 8551459 commit 5563f3e
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions libraries/plugins/import/ImportSql.php
Expand Up @@ -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;

Expand Down Expand Up @@ -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);
}

/**
Expand Down

0 comments on commit 5563f3e

Please sign in to comment.