Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

import.php

@@ -68,7 +68,6 @@ if (isset($_REQUEST['console_bookmark_add'])) {
  * Sets globals from $_POST
  */
 $post_params = array(
-    'bkm_label',
     'charset_of_file',
     'format',
     'import_type',
@@ -675,7 +674,7 @@ if (! empty($id_bookmark) && $_REQUEST['action_bookmark'] == 2) {
 } elseif ($bookmark_created) {
     $special_message = '[br]'  . sprintf(
         __('Bookmark %s has been created.'),
-        htmlspecialchars($bkm_label)
+        htmlspecialchars($_POST['bkm_label'])
     );
 } elseif ($finished && ! $error) {
     if ($import_type == 'query') {

libraries/mult_submits.inc.php

@@ -170,7 +170,7 @@ if (!empty($submit_mult) && !empty($what)) {
     // Builds the query
     list($full_query, $reload, $full_query_views)
         = PMA_getQueryFromSelected(
-            $what, $db, $table, $selected, $views
+            $what, $table, $selected, $views
         );
 
     // Displays the confirmation form

libraries/mult_submits.lib.php

@@ -529,14 +529,13 @@ function PMA_getDataForSubmitMult($submit_mult, $db, $table, $selected, $action)
  * Get query string from Selected
  *
  * @param string $what     mult_submit type
- * @param string $db       database name
  * @param string $table    table name
  * @param array  $selected the selected columns
  * @param array  $views    table views
  *
  * @return array
  */
-function PMA_getQueryFromSelected($what, $db, $table, $selected, $views)
+function PMA_getQueryFromSelected($what, $table, $selected, $views)
 {
     $reload = false;
     $full_query_views = null;

libraries/replication_gui.lib.php

@@ -87,12 +87,12 @@ function PMA_getHtmlForMasterConfiguration()
     $html  = '<fieldset>';
     $html .= '<legend>' . __('Master configuration') . '</legend>';
     $html .= __(
-        'This server is not configured as master server in a '
+        'This server is not configured as a master server in a '
         . 'replication process. You can choose from either replicating '
-        . 'all databases and ignoring certain (useful if you want to replicate '
-        . 'majority of databases) or you can choose to ignore all databases by '
-        . 'default and allow only certain databases to be replicated. '
-        . 'Please select the mode:'
+        . 'all databases and ignoring some of them (useful if you want to '
+        . 'replicate a majority of the databases) or you can choose to ignore '
+        . 'all databases by default and allow only certain databases to be '
+        . 'replicated. Please select the mode:'
     ) . '<br /><br />';
 
     $html .= '<select name="db_type" id="db_type">';

test/libraries/PMA_mult_submits_test.php

@@ -433,7 +433,6 @@ class PMA_MultSubmits_Test extends PHPUnit_Framework_TestCase
     public function testPMAGetQueryFromSelected()
     {
         $what = "drop_tbl";
-        $db = "PMA_db";
         $table = "PMA_table";
         $selected = array(
             "table1", "table2"
@@ -444,7 +443,7 @@ class PMA_MultSubmits_Test extends PHPUnit_Framework_TestCase
 
         list($full_query, $reload, $full_query_views)
             = PMA_getQueryFromSelected(
-                $what, $db, $table, $selected, $views
+                $what, $table, $selected, $views
             );
 
         //validate 1: $full_query
@@ -469,7 +468,7 @@ class PMA_MultSubmits_Test extends PHPUnit_Framework_TestCase
 
         list($full_query, $reload, $full_query_views)
             = PMA_getQueryFromSelected(
-                $what, $db, $table, $selected, $views
+                $what, $table, $selected, $views
             );
 
         //validate 1: $full_query