Merge remote-tracking branch 'origin/master'

ChangeLog

@@ -33,6 +33,7 @@ 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
 
 3.5.1.0 (not yet released)
 - bug #3510784 [edit] Limit clause ignored when sort order is remembered

Documentation.html

@@ -1647,10 +1647,6 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
         hard coded password value in the configuration file, end users can't
         be allowed to change their passwords.</dd>
 
-    <dt id="cfg_SuggestDBName">$cfg['SuggestDBName'] boolean</dt>
-    <dd>Defines whether to suggest a database name on the
-        &quot;Create Database&quot; form or to keep the textfield empty.</dd>
-
     <dt id="cfg_ShowDbStructureCreation">$cfg['ShowDbStructureCreation'] boolean</dt>
     <dd>Defines whether the database structure page (tables list) has a 
         &quot;Creation&quot; column that displays when each table was created.</dd>

libraries/check_user_privileges.lib.php

@@ -109,14 +109,12 @@ function PMA_analyseShowGrant()
                     || (! PMA_DBI_try_query('USE ' .  preg_replace('/' . $re1 . '(%|_)/', '\\1\\3', $dbname_to_test))
                     && substr(PMA_DBI_getError(), 1, 4) != 1044)
                 ) {
-                    if ($GLOBALS['cfg']['SuggestDBName']) {
-                        /**
-                         * Do not handle the underscore wildcard
-                         * (this case must be rare anyway)
-                         */
-                        $GLOBALS['db_to_create'] = preg_replace('/' . $re0 . '%/',     '\\1...', $show_grants_dbname);
-                        $GLOBALS['db_to_create'] = preg_replace('/' . $re1 . '(%|_)/', '\\1\\3', $GLOBALS['db_to_create']);
-                    }
+                    /**
+                     * Do not handle the underscore wildcard
+                     * (this case must be rare anyway)
+                     */
+                    $GLOBALS['db_to_create'] = preg_replace('/' . $re0 . '%/',     '\\1...', $show_grants_dbname);
+                    $GLOBALS['db_to_create'] = preg_replace('/' . $re1 . '(%|_)/', '\\1\\3', $GLOBALS['db_to_create']);
                     $GLOBALS['is_create_db_priv'] = true;
 
                     /**

libraries/config.default.php

@@ -942,13 +942,6 @@ $cfg['ShowChgPassword'] = true;
  */
 $cfg['ShowCreateDb'] = true;
 
-/**
- * suggest a new DB name if possible (false = keep empty)
- *
- * @global boolean $cfg['SuggestDBName']
- */
-$cfg['SuggestDBName'] = true;
-
 
 /*******************************************************************************
  * Database structure

libraries/config/messages.inc.php

@@ -499,8 +499,6 @@ $strConfigSQLValidator_use_desc = __('[strong]Warning:[/strong] requires PHP SOA
 $strConfigSQLValidator_use_name = __('Enable SQL Validator');
 $strConfigSQLValidator_username_desc = __('If you have a custom username, specify it here (defaults to [kbd]anonymous[/kbd])');
 $strConfigSQLValidator_username_name = __('Username');
-$strConfigSuggestDBName_desc = __('Suggest a database name on the "Create Database" form (if possible) or keep the text field empty');
-$strConfigSuggestDBName_name = __('Suggest new database name');
 $strConfigSuhosinDisableWarning_desc = __('A warning is displayed on the main page if Suhosin is detected');
 $strConfigSuhosinDisableWarning_name = __('Suhosin warning');
 $strConfigTextareaCols_desc = __('Textarea size (columns) in edit mode, this value will be emphasized for SQL query textareas (*2) and for query window (*1.25)');

libraries/config/setup.forms.php

@@ -186,9 +186,7 @@ $forms['Left_frame']['Left_tables'] = array(
     'ShowTooltip',
     'ShowTooltipAliasTB');
 $forms['Main_frame']['Startup'] = array(
-    'ShowCreateDb' => ':group',
-        'SuggestDBName',
-        ':group:end',
+    'ShowCreateDb',
     'ShowStats',
     'ShowServerInfo',
     'ShowPhpInfo',

libraries/config/user_preferences.forms.php

@@ -97,9 +97,7 @@ $forms['Left_frame']['Left_tables'] = array(
     'ShowTooltip',
     'ShowTooltipAliasTB');
 $forms['Main_frame']['Startup'] = array(
-    'ShowCreateDb' => ':group',
-        'SuggestDBName',
-        ':group:end',
+    'ShowCreateDb',
     'ShowStats',
     'ShowServerInfo');
 $forms['Main_frame']['DbStructure'] = array(