diff --git a/import.php b/import.php index 87856e82ea..6894f1778c 100644 --- a/import.php +++ b/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') { diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php index 46d3f79b7a..7a8a731ca2 100644 --- a/libraries/mult_submits.inc.php +++ b/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 diff --git a/libraries/mult_submits.lib.php b/libraries/mult_submits.lib.php index 1c1dc60768..6f18a57b92 100644 --- a/libraries/mult_submits.lib.php +++ b/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; diff --git a/libraries/replication_gui.lib.php b/libraries/replication_gui.lib.php index bc45bfb4da..c3deaa43dd 100644 --- a/libraries/replication_gui.lib.php +++ b/libraries/replication_gui.lib.php @@ -87,12 +87,12 @@ function PMA_getHtmlForMasterConfiguration() $html = '
'; $html .= '' . __('Master configuration') . ''; $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:' ) . '

'; $html .= '