Merge remote-tracking branch 'origin/master'

ChangeLog

@@ -33,7 +33,8 @@ phpMyAdmin - ChangeLog
 - bug #3510196 [core] Improved redirecting with ForceSSL option
 + rfe #3518852 [edit] edit blob but not other binary, new option $cfg['ProtectBinary'] = 'noblob'
 + Hide language select box if there are no locales installed
-+ Removed some directives: verbose_check, SuggestDBName, LightTabs
++ Removed some directives: verbose_check, SuggestDBName, LightTabs,
+VerboseMultiSubmit
 - Patch #3500882 Fixing checkbox behaviour while editing identical rows
 + rfe #3441722 [interface] Display description of datatypes
 + rfe #3517835 [structure] Move columns easily

Documentation.html

@@ -1495,11 +1495,6 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
     <dd>Define whether phpMyAdmin will continue executing a multi-query
         statement if one of the queries fails. Default is to abort execution.</dd>
 
-    <dt id="cfg_VerboseMultiSubmit">$cfg['VerboseMultiSubmit'] boolean</dt>
-    <dd>Define whether phpMyAdmin will output the results of each query of a
-        multi-query statement embedded into the
-        <abbr title="structured query language">SQL</abbr> output as inline
-        comments. Defaults to <code>TRUE</code>.</dd>
     <dt id="AllowArbitraryServer">
         <span id="cfg_AllowArbitraryServer">$cfg['AllowArbitraryServer']</span> boolean</dt>
     <dd>If enabled, allows you to log in to arbitrary servers using cookie auth and permits to specify servers of your choice in the Synchronize dialog.
@@ -1590,7 +1585,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
     <dd>Defines the minimum number of tables to display a JavaScript filter box above the
     list of tables in the left frame.
     Defaults to <code>30</code>. To disable the filter completely some high number
-    can he used (e.g. 9999)</dd>
+    can be used (e.g. 9999)</dd>
 
     <dt id="cfg_LeftDisplayServers">$cfg['LeftDisplayServers'] boolean</dt>
     <dd>Defines whether or not to display a server choice at the top of the left frame.

libraries/config.default.php

@@ -428,7 +428,7 @@ $cfg['Servers'][$i]['AllowDeny']['order'] = '';
 $cfg['Servers'][$i]['AllowDeny']['rules'] = array();
 
 /**
- * Disable use of INFORMATION_SCHEMA. Is always 'true' for Drizzle.
+ * Disable use of INFORMATION_SCHEMA. Is always 'false' for Drizzle.
  *
  * @see http://sf.net/support/tracker.php?aid=1849494
  * @see http://bugs.mysql.com/19588
@@ -703,15 +703,6 @@ $cfg['UseDbSearch'] = true;
  */
 $cfg['IgnoreMultiSubmitErrors'] = false;
 
-/**
- * if set to true, PMA will show the affected rows of EACH statement on
- * multiple-statement queries. See the libraries/import.php file for
- * hard coded defaults on how many queries a statement may contain!
- *
- * @global boolean $cfg['VerboseMultiSubmit']
- */
-$cfg['VerboseMultiSubmit'] = true;
-
 /**
  * allow login to any user entered server in cookie based authentication
  *

libraries/config/messages.inc.php

@@ -521,8 +521,6 @@ $strConfigUseDbSearch_desc = __('Allow for searching inside the entire database'
 $strConfigUseDbSearch_name = __('Use database search');
 $strConfigUserprefsDeveloperTab_desc = __('When disabled, users cannot set any of the options below, regardless of the checkbox on the right');
 $strConfigUserprefsDeveloperTab_name = __('Enable the Developer tab in settings');
-$strConfigVerboseMultiSubmit_desc = __('Show affected rows of each statement on multiple-statement queries. See libraries/import.lib.php for defaults on how many queries a statement may contain.');
-$strConfigVerboseMultiSubmit_name = __('Verbose multiple statements');
 $strConfigVersionCheckLink = __('Check for latest version');
 $strConfigVersionCheck_desc = __('Enables check for latest version on main phpMyAdmin page');
 $strConfigVersionCheck_name = __('Version check');

libraries/config/setup.forms.php

@@ -145,7 +145,6 @@ $forms['Sql_queries']['Sql_queries'] = array(
     'QueryHistoryDB',
     'QueryHistoryMax',
     'IgnoreMultiSubmitErrors',
-    'VerboseMultiSubmit',
     'MaxCharactersInDisplayedSQL',
     'EditInWindow',
     //'QueryWindowWidth', // overridden in theme

libraries/config/user_preferences.forms.php

@@ -63,7 +63,6 @@ $forms['Sql_queries']['Sql_queries'] = array(
     'Confirm',
     'QueryHistoryMax',
     'IgnoreMultiSubmitErrors',
-    'VerboseMultiSubmit',
     'MaxCharactersInDisplayedSQL',
     'EditInWindow',
     //'QueryWindowWidth', // overridden in theme

libraries/import.lib.php

@@ -138,15 +138,13 @@ function PMA_importRunQuery($sql = '', $full = '', $controluser = false)
                             }
                             $my_die[] = array('sql' => $import_run_buffer['full'], 'error' => PMA_DBI_getError());
 
-                            if ($cfg['VerboseMultiSubmit']) {
-                                $msg .= __('Error');
-                            }
+                            $msg .= __('Error');
 
                             if (!$cfg['IgnoreMultiSubmitErrors']) {
                                 $error = true;
                                 return;
                             }
-                        } elseif ($cfg['VerboseMultiSubmit']) {
+                        } else {
                             $a_num_rows = (int)@PMA_DBI_num_rows($result);
                             $a_aff_rows = (int)@PMA_DBI_affected_rows();
                             if ($a_num_rows > 0) {
@@ -190,16 +188,11 @@ function PMA_importRunQuery($sql = '', $full = '', $controluser = false)
             // (if $run_query is false, we are just displaying so show
             // the complete query in the textarea)
             if (! $go_sql && $run_query) {
-                if ($cfg['VerboseMultiSubmit'] && ! empty($sql_query)) {
+                if (! empty($sql_query)) {
                     if (strlen($sql_query) > 50000 || $executed_queries > 50 || $max_sql_len > 1000) {
                         $sql_query = '';
                         $sql_query_disabled = true;
                     }
-                } else {
-                    if (strlen($sql_query) > 10000 || $executed_queries > 10 || $max_sql_len > 500) {
-                        $sql_query = '';
-                        $sql_query_disabled = true;
-                    }
                 }
             }
         } // end do query (no skip)