gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added $cfg['ServerLibraryDifference_DisableWarning'] to make it possible to hide the warning about differences in MySQL library and server version.

Browse Source
This commit is contained in:
Jim Nelin 2012-10-22 17:22:03 +02:00
parent d4ef7f8982
commit 8e6d434159
6 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation.html
View File

@ -624,6 +624,12 @@ since this link provides funding for phpMyAdmin.
You can set this parameter to <code>TRUE</code> to stop this message
from appearing.</dd>
<dt id="cfg_ServerLibraryDifference_DisableWarning">$cfg['ServerLibraryDifference_DisableWarning'] boolean</dt>
<dd>A warning is displayed on the main page if there is a difference
between the MySQL library and server version.
You can set this parameter to <code>TRUE</code> to stop this message
from appearing.</dd>
<dt id="cfg_TranslationWarningThreshold">$cfg['TranslationWarningThreshold'] integer</dt>
<dd>Show warning about incomplete translations on certain threshold.</dd>

8
libraries/config.default.php
View File

@ -61,6 +61,14 @@ $cfg['SuhosinDisableWarning'] = false;
*/
$cfg['McryptDisableWarning'] = false;
/**
* Disable the default warning that is displayed if a diffrence between
* the MySQL library and server is detected.
*
* @global boolean $cfg['['ServerLibraryDifference_DisableWarning']']
*/
$cfg['ServerLibraryDifference_DisableWarning'] = false;
/**
* Show warning about incomplete translations on certain threshold.
*

2
libraries/config/messages.inc.php
View File

@ -336,6 +336,8 @@ $strConfigPersistentConnections_desc = __('Use persistent connections to MySQL d
$strConfigPersistentConnections_name = __('Persistent connections');
$strConfigPmaNoRelation_DisableWarning_desc = __('Disable the default warning that is displayed on the database details Structure page if any of the required tables for the phpMyAdmin configuration storage could not be found');
$strConfigPmaNoRelation_DisableWarning_name = __('Missing phpMyAdmin configuration storage tables');
$strConfigServerLibraryDifference_DisableWarning_desc = __('Disable the default warning that is displayed if a diffrence between the MySQL library and server is detected');
$strConfigServerLibraryDifference_DisableWarning_name = __('Server/library diffrence warning');
$strConfigPropertiesIconic_desc = __('Use only icons, only text or both');
$strConfigPropertiesIconic_name = __('Iconic table operations');
$strConfigProtectBinary_desc = __('Disallow BLOB and BINARY columns from editing');

1
libraries/config/setup.forms.php
View File

@ -114,6 +114,7 @@ $forms['Features']['Page_titles'] = array(
'TitleDatabase',
'TitleServer');
$forms['Features']['Warnings'] = array(
'ServerLibraryDifference_DisableWarning',
'PmaNoRelation_DisableWarning',
'SuhosinDisableWarning',
'McryptDisableWarning');

1
libraries/config/user_preferences.forms.php
View File

@ -49,6 +49,7 @@ $forms['Features']['Page_titles'] = array(
'TitleDatabase',
'TitleServer');
$forms['Features']['Warnings'] = array(
'ServerLibraryDifference_DisableWarning',
'PmaNoRelation_DisableWarning',
'SuhosinDisableWarning',
'McryptDisableWarning');

4
main.php
View File

@ -454,7 +454,9 @@ if ($server > 0) {
* Drizzle can speak MySQL protocol, so don't warn about version mismatch for
* Drizzle servers.
*/
if (function_exists('PMA_DBI_get_client_info') && !PMA_DRIZZLE) {
if (function_exists('PMA_DBI_get_client_info') && !PMA_DRIZZLE
&& $cfg['ServerLibraryDiffrence_DisableWarning'] == false
) {
$_client_info = PMA_DBI_get_client_info();
if ($server > 0
&& strpos($_client_info, 'mysqlnd') === false