Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Čihař <michal@cihar.com>2017-02-20 11:19:22 +0300
committerMichal Čihař <michal@cihar.com>2017-02-20 11:19:22 +0300
commit8cc6de4de37cc37c55db06bf685ff3fb93a48bf7 (patch)
tree6bb463fffb8aadbc836125d0779b7472966bb85e /index.php
parent53eff5d47b664558fd02881cde14f8144d997cfb (diff)
Remove ServerLibraryDifference_DisableWarning setting
This is getting more and more problematic these days as most of Linux distributions ship MariaDB libraries, while many people run MySQL servers. As MariaDB claims the protocol compatibility should stay, we should not warn in this case. Of course there is option to add this exception to the warning (so far the exception is there only other way - when using MySQL libraries to connect to MariaDB server), but we would be ignoring most cases already and I think complete removal is better than adding exceptions. Overall I don't think this warning is doing any good these days. Signed-off-by: Michal Čihař <michal@cihar.com>
Diffstat (limited to 'index.php')
-rw-r--r--index.php42
1 files changed, 0 insertions, 42 deletions
diff --git a/index.php b/index.php
index f33a0b44c9..816ad7bf58 100644
--- a/index.php
+++ b/index.php
@@ -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