[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-788-g55c2dcb

[Marc Delisle]

The branch, master has been updated
       via  55c2dcb6648ffa78f698a4cca453662ba6a14189 (commit)
      from  b3cab1566336557b81e277c27703a98a25c6ca18 (commit)


- Log -----------------------------------------------------------------
commit 55c2dcb6648ffa78f698a4cca453662ba6a14189
Author: Marc Delisle <marc at infomarc.info>
Date:   Tue Dec 14 12:30:40 2010 -0500

    bug #3137351 User preferences and hide_db

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

Summary of changes:
 libraries/config/validate.lib.php |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/libraries/config/validate.lib.php b/libraries/config/validate.lib.php
index 59df2b8..60aa33b 100644
--- a/libraries/config/validate.lib.php
+++ b/libraries/config/validate.lib.php
@@ -307,7 +307,9 @@ function validate_regex($path, $values)
     test_php_errormsg();
 
     $matches = array();
-    preg_match($values[$path], '', $matches);
+    // in libraries/List_Database.class.php _checkHideDatabase(),
+    // a '/' is used as the delimiter for hide_db
+    preg_match('/' . $values[$path] . '/', '', $matches);
 
     test_php_errormsg(false);
 
@@ -457,4 +459,4 @@ function validate_upper_bound($path, $values, $max_value)
     $result = $values[$path] <= $max_value;
     return array($path => ($result ? '' : sprintf(__('Value must be equal or lower than %s'), $max_value)));
 }
-?>
\ No newline at end of file
+?>


hooks/post-receive
-- 
phpMyAdmin