[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0-157-g35852be

[Michal Čihař]

The branch, master has been updated
       via  35852be38cdf665544839bbbf5e233d6c95dc4a0 (commit)
       via  ec519d5d251230b4bfd72cc22b2a2d29b30f3559 (commit)
       via  43b41e2ed3020edb1c26e821c6ed4f5065dd364c (commit)
      from  76a93bafdf69ece26e0492fbc903ec264456c6df (commit)


- Log -----------------------------------------------------------------
commit 35852be38cdf665544839bbbf5e233d6c95dc4a0
Merge: 76a93bafdf69ece26e0492fbc903ec264456c6df ec519d5d251230b4bfd72cc22b2a2d29b30f3559
Author: Michal Čihař <mcihar at novell.com>
Date:   Fri May 13 11:54:31 2011 +0200

    Merge branch 'QA_3_4'

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

Summary of changes:
 js/functions.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/js/functions.js b/js/functions.js
index 6cae921..769365b 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -90,7 +90,7 @@ function parseVersionString (str) {
  * Indicates current available version on main page.
  */
 function PMA_current_version() {
-    var current = parseVersionString('3.4.0'/*pmaversion*/);
+    var current = parseVersionString(pmaversion);
     var latest = parseVersionString(PMA_latest_version);
     $('#li_pma_version').append(PMA_messages['strLatestAvailable'] + ' ' + PMA_latest_version);
     if (latest > current) {


hooks/post-receive
-- 
phpMyAdmin