gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Atul Pratap Singh 2012-06-09 18:00:42 +05:30
commit 96ede30c3c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/insert_edit.lib.php
View File

@ -1661,7 +1661,7 @@ function PMA_buildSqlQuery($is_insertignore, $query_fields, $value_sets)
* @param array $url_params url paramters array
* @param string $query built query from PMA_buildSqlQuery()
* @return array $url_params, $total_affected_rows, $last_messages
* $warning_messages, $error_messages
* $warning_messages, $error_messages, $return_to_sql_query
*/
function PMA_executeSqlQuery($url_params, $query)
{
@ -1715,7 +1715,7 @@ function PMA_executeSqlQuery($url_params, $query)
$warning_messages = PMA_getWarningMessages();
}
unset($result, $single_query, $last_message, $query);
return array($url_params, $total_affected_rows, $last_messages, $warning_messages, $error_messages);
return array($url_params, $total_affected_rows, $last_messages, $warning_messages, $error_messages, $return_to_sql_query);
}
/**

2
tbl_replace.php
View File

@ -277,7 +277,7 @@ unset($multi_edit_colummns, $is_insertignore);
* page
*/
list ($url_params, $total_affected_rows, $last_messages, $warning_messages,
$error_messages) = PMA_executeSqlQuery($url_params, $query);
$error_messages, $return_to_sql_query) = PMA_executeSqlQuery($url_params, $query);
if ($is_insert && count($value_sets) > 0) {
$message = PMA_Message::inserted_rows($total_affected_rows);