diff options
author | Michal Čihař <michal@cihar.com> | 2016-10-03 20:38:40 +0300 |
---|---|---|
committer | Michal Čihař <michal@cihar.com> | 2016-10-03 20:38:40 +0300 |
commit | fc5bb4a278702d816eb0713427d22ad645f988d7 (patch) | |
tree | 7c1786fbcd39ad197e489ce8ae43b596ae43895f /import.php | |
parent | d24848400d1d5e147b5e38ebef8985152d82f968 (diff) | |
parent | 4ba041720fb0177f156547b09915d3e13d98144d (diff) |
Merge branch 'QA_4_6'
Diffstat (limited to 'import.php')
-rw-r--r-- | import.php | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/import.php b/import.php index 122671e37e..7e58f6a7aa 100644 --- a/import.php +++ b/import.php @@ -679,6 +679,7 @@ if ($go_sql) { } $html_output = ''; + foreach ($sql_queries as $sql_query) { // parse sql query @@ -714,7 +715,7 @@ if ($go_sql) { $db, // db $table, // table null, // find_real_end - $_REQUEST['sql_query'], // sql_query_for_bookmark + null, // sql_query_for_bookmark - see below null, // extra_data null, // message_to_show null, // message @@ -730,6 +731,18 @@ if ($go_sql) { ); } + // sql_query_for_bookmark is not included in PMA_executeQueryAndGetQueryResponse + // since only one bookmark has to be added for all the queries submitted through + // the SQL tab + if (! empty($_POST['bkm_label']) && ! empty($import_text)) { + $cfgBookmark = PMA_Bookmark_getParams(); + PMA_storeTheQueryAsBookmark( + $db, $cfgBookmark['user'], + $_REQUEST['sql_query'], $_POST['bkm_label'], + isset($_POST['bkm_replace']) ? $_POST['bkm_replace'] : null + ); + } + $response = PMA\libraries\Response::getInstance(); $response->addJSON('ajax_reload', $ajax_reload); $response->addHTML($html_output); |