[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-751-gcf4d865

[Michal Čihař]

The branch, master has been updated
       via  cf4d86532e27657fa28bb2eb9796675c2c85d474 (commit)
      from  4c183835245bd29b7ddb8ca62b542511f2c9d2b3 (commit)


- Log -----------------------------------------------------------------
commit cf4d86532e27657fa28bb2eb9796675c2c85d474
Author: Michal Čihař <mcihar at novell.com>
Date:   Thu Feb 17 10:59:00 2011 +0100

    Link to MySQL 5.5 documentation on servers running MySQL 5.5

-----------------------------------------------------------------------

Summary of changes:
 libraries/common.lib.php |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 8388572..95aaae6 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -401,7 +401,11 @@ function PMA_showMySQLDocu($chapter, $link, $big_icon = false, $anchor = '', $ju
             $mysql = '5.0';
             $lang = 'en';
             if (defined('PMA_MYSQL_INT_VERSION')) {
-                if (PMA_MYSQL_INT_VERSION >= 50100) {
+                if (PMA_MYSQL_INT_VERSION >= 50500) {
+                    $mysql = '5.5';
+                    /* l10n: Language to use for MySQL 5.5 documentation, please use only languages which do exist in official documentation.  */
+                    $lang = _pgettext('MySQL 5.5 documentation language', 'en');
+                } else if (PMA_MYSQL_INT_VERSION >= 50100) {
                     $mysql = '5.1';
                     /* l10n: Language to use for MySQL 5.1 documentation, please use only languages which do exist in official documentation.  */
                     $lang = _pgettext('MySQL 5.1 documentation language', 'en');


hooks/post-receive
-- 
phpMyAdmin