diff options
| -rw-r--r-- | doc/config.rst | 4 | ||||
| -rw-r--r-- | index.php | 42 | ||||
| -rw-r--r-- | libraries/config.default.php | 8 | ||||
| -rw-r--r-- | libraries/config/messages.inc.php | 6 | ||||
| -rw-r--r-- | libraries/config/setup.forms.php | 1 | ||||
| -rw-r--r-- | libraries/config/user_preferences.forms.php | 1 |
6 files changed, 4 insertions, 58 deletions
diff --git a/doc/config.rst b/doc/config.rst index 2f6a22336a..c60891b52d 100644 --- a/doc/config.rst +++ b/doc/config.rst @@ -108,6 +108,10 @@ Basic settings :type: boolean :default: false + .. deprecated:: 4.7.0 + + This setting was removed as the warning has been removed as well. + A warning is displayed on the main page if there is a difference between the MySQL library and server version. @@ -575,48 +575,6 @@ if ($server > 0) { } /** - * Warning about different MySQL library and server version - * (a difference on the third digit does not count). - * If someday there is a constant that we can check about mysqlnd, - * we can use it instead of strpos(). - * If no default server is set, $GLOBALS['dbi'] is not defined yet. - * We also do not warn if MariaDB is detected, as it has its own version - * numbering. - */ -if (isset($GLOBALS['dbi']) - && $cfg['ServerLibraryDifference_DisableWarning'] == false -) { - $_client_info = $GLOBALS['dbi']->getClientInfo(); - if ($server > 0 - && mb_strpos($_client_info, 'mysqlnd') === false - && mb_strpos(PMA_MYSQL_STR_VERSION, 'MariaDB') === false - && substr(PMA_MYSQL_CLIENT_API, 0, 3) != substr( - PMA_MYSQL_INT_VERSION, 0, 3 - ) - ) { - trigger_error( - Sanitize::sanitize( - sprintf( - __( - 'Your PHP MySQL library version %s differs from your ' . - 'MySQL server version %s. This may cause unpredictable ' . - 'behavior.' - ), - $_client_info, - substr( - PMA_MYSQL_STR_VERSION, - 0, - strpos(PMA_MYSQL_STR_VERSION . '-', '-') - ) - ) - ), - E_USER_NOTICE - ); - } - unset($_client_info); -} - -/** * Warning about Suhosin only if its simulation mode is not enabled */ if ($cfg['SuhosinDisableWarning'] == false diff --git a/libraries/config.default.php b/libraries/config.default.php index a9abf5defa..061ee88bf6 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -62,14 +62,6 @@ $cfg['SuhosinDisableWarning'] = false; $cfg['LoginCookieValidityDisableWarning'] = false; /** - * Disable the default warning that is displayed if a difference between - * the MySQL library and server is detected. - * - * @global boolean $cfg['['ServerLibraryDifference_DisableWarning']'] - */ -$cfg['ServerLibraryDifference_DisableWarning'] = false; - -/** * Disable the default warning about MySQL reserved words in column names * * @global boolean $cfg['ReservedWordDisableWarning'] diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php index cbf973478d..e39ed2ac1b 100644 --- a/libraries/config/messages.inc.php +++ b/libraries/config/messages.inc.php @@ -568,12 +568,6 @@ $strConfigPmaNoRelation_DisableWarning_desc = __( ); $strConfigPmaNoRelation_DisableWarning_name = __('Missing phpMyAdmin configuration storage tables'); -$strConfigServerLibraryDifference_DisableWarning_desc = __( - 'Disable the default warning that is displayed if a difference between the ' - . 'MySQL library and server is detected.' -); -$strConfigServerLibraryDifference_DisableWarning_name - = __('Server/library difference warning'); $strConfigReservedWordDisableWarning_desc = __( 'Disable the default warning that is displayed on the Structure page if column ' . 'names in a table are reserved MySQL words.' diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php index 2e1d6fb2c3..d308664b9f 100644 --- a/libraries/config/setup.forms.php +++ b/libraries/config/setup.forms.php @@ -117,7 +117,6 @@ $forms['Features']['Page_titles'] = array( 'TitleDatabase', 'TitleServer'); $forms['Features']['Warnings'] = array( - 'ServerLibraryDifference_DisableWarning', 'PmaNoRelation_DisableWarning', 'SuhosinDisableWarning', 'LoginCookieValidityDisableWarning'); diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php index 09bb547257..650a2ad718 100644 --- a/libraries/config/user_preferences.forms.php +++ b/libraries/config/user_preferences.forms.php @@ -53,7 +53,6 @@ $forms['Features']['Page_titles'] = array( 'TitleDatabase', 'TitleServer'); $forms['Features']['Warnings'] = array( - 'ServerLibraryDifference_DisableWarning', 'PmaNoRelation_DisableWarning', 'SuhosinDisableWarning', 'LoginCookieValidityDisableWarning', |