[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA4-1796-g9433f4e

[Michal Čihař]

The branch, master has been updated
       via  9433f4e78fdc847554d900ea440e642685d8dd75 (commit)
      from  8119fa376954e8fc7811c67cd68401b474f8d4f0 (commit)


- Log -----------------------------------------------------------------
commit 9433f4e78fdc847554d900ea440e642685d8dd75
Author: Michal Čihař <mcihar at novell.com>
Date:   Thu Apr 7 14:35:11 2011 +0200

    Fix check for latest version to work with versions like -rc1-dev

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

Summary of changes:
 setup/lib/index.lib.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/setup/lib/index.lib.php b/setup/lib/index.lib.php
index a90bc3d..5d42910 100644
--- a/setup/lib/index.lib.php
+++ b/setup/lib/index.lib.php
@@ -176,7 +176,7 @@ function PMA_version_check()
 function version_to_int($version)
 {
     $matches = array();
-    if (!preg_match('/^(\d+)\.(\d+)\.(\d+)((\.|-(pl|rc|dev|beta|alpha))(\d+)?)?$/', $version, $matches)) {
+    if (!preg_match('/^(\d+)\.(\d+)\.(\d+)((\.|-(pl|rc|dev|beta|alpha))(\d+)?(-dev)?)?$/', $version, $matches)) {
         return false;
     }
     if (!empty($matches[6])) {


hooks/post-receive
-- 
phpMyAdmin