Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4

2015-03-11 21:00:46 +01:00 · 2015-03-11 21:00:46 +01:00 · 11788163ff
commit 11788163ff
parent 97a682b3c0 44c28bd5a2
2 changed files with 2 additions and 1 deletions
--- a/1
+++ b/1
@ -74,6 +74,7 @@ explanation
 - bug       Compatibility with central columns of version 4.4
 - bug #4758 Firefox with auth_type to http with multiple server doesn't work anymore
 - bug #4789 Views aren't dropped when copying a database
+- bug #4784 Incomplete bookmark saving

 4.3.11.1 (2015-03-04)
 - bug       [security] Risk of BREACH attack, see PMASA-2015-1
--- a/import.php
+++ b/import.php
@ -734,7 +734,7 @@ if ($go_sql) {
        $cfgBookmark = PMA_Bookmark_getParams();
        PMA_storeTheQueryAsBookmark(
            $db, $cfgBookmark['user'],
-            $import_text, $_POST['bkm_label'],
+            $_REQUEST['sql_query'], $_POST['bkm_label'],
            isset($_POST['bkm_replace']) ? $_POST['bkm_replace'] : null
        );
    }