From 135077bbc023429ac199f45b2d503655fa19da4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 16 Dec 2015 14:45:32 +0100 Subject: [PATCH] Fold updateSqlData into new function MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- libraries/import.lib.php | 31 +++++++------------------------ 1 file changed, 7 insertions(+), 24 deletions(-) diff --git a/libraries/import.lib.php b/libraries/import.lib.php index d0f9346f88..9257b3ebb0 100644 --- a/libraries/import.lib.php +++ b/libraries/import.lib.php @@ -122,9 +122,13 @@ function PMA_executeQuery($sql = '', $full = '', &$sql_data) ); } - updateSqlData( - $sql_data, $a_num_rows, $is_use_query, $sql - ); + if (($a_num_rows > 0) || $is_use_query) { + $sql_data['valid_sql'][] = $sql; + if (!isset($sql_data['valid_queries'])) { + $sql_data['valid_queries'] = 0; + } + $sql_data['valid_queries']++; + } } if (! $sql_query_disabled) { $sql_query .= $msg . "\n"; @@ -277,27 +281,6 @@ function PMA_importRunQuery($sql = '', $full = '', &$sql_data = array()) } } -/** - * Update $sql_data - * - * @param array &$sql_data SQL data - * @param int $a_num_rows Number of rows - * @param bool $is_use_query Query is used - * @param string $sql SQL query - * - * @return array - */ -function updateSqlData(&$sql_data, $a_num_rows, $is_use_query, $sql) -{ - if (($a_num_rows > 0) || $is_use_query) { - $sql_data['valid_sql'][] = $sql; - if (!isset($sql_data['valid_queries'])) { - $sql_data['valid_queries'] = 0; - } - $sql_data['valid_queries']++; - } -} - /** * Return import run buffer *