[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11679-g236582f

Michal Čihař nijel at users.sourceforge.net
Fri Jul 22 09:24:29 CEST 2011


The branch, master has been updated
       via  236582fb4f86ed8ae6022afc17af37e1d4a19cb9 (commit)
      from  9405dbb82a38ca03e0d5a54e06b73be80ec51692 (commit)


- Log -----------------------------------------------------------------
commit 236582fb4f86ed8ae6022afc17af37e1d4a19cb9
Author: Michal Čihař <mcihar at suse.cz>
Date:   Fri Jul 22 09:25:14 2011 +0200

    Fix mistakenly broken regexp

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

Summary of changes:
 libraries/common.lib.php        |    2 +-
 libraries/ip_allow_deny.lib.php |    4 ++--
 libraries/sqlparser.lib.php     |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 1607d6e..27d99bc 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -567,7 +567,7 @@ function PMA_mysqlDie($error_message = '', $the_query = '',
     } // end if
 
     if (!empty($error_message)) {
-        $error_message = preg_replace("@((\015\012)|(\015)|(\012)) {3,}@", "\n\n", $error_message);
+        $error_message = preg_replace("@((\015\012)|(\015)|(\012)){3,}@", "\n\n", $error_message);
     }
     // modified to show the help on error-returns
     // (now error-messages-server)
diff --git a/libraries/ip_allow_deny.lib.php b/libraries/ip_allow_deny.lib.php
index c8481ba..2b969d1 100644
--- a/libraries/ip_allow_deny.lib.php
+++ b/libraries/ip_allow_deny.lib.php
@@ -30,7 +30,7 @@ function PMA_getIp()
         $trusted_header_value = PMA_getenv($GLOBALS['cfg']['TrustedProxies'][$direct_ip]);
         $matches = array();
         // the $ checks that the header contains only one IP address, ?: makes sure the () don't capture
-        $is_ip = preg_match('|^(?:[0-9]{1,3}\.) {3,3}[0-9]{1,3}$|', $trusted_header_value, $matches);
+        $is_ip = preg_match('|^(?:[0-9]{1,3}\.){3,3}[0-9]{1,3}$|', $trusted_header_value, $matches);
         if ($is_ip && (count($matches) == 1)) {
             // True IP behind a proxy
             return $matches[0];
@@ -46,7 +46,7 @@ function PMA_getIp()
  * Based on IP Pattern Matcher
  * Originally by J.Adams <jna at retina.net>
  * Found on <http://www.php.net/manual/en/function.ip2long.php>
- * Modified for phpMyAdmin 
+ * Modified for phpMyAdmin
  *
  * Matches:
  * xxx.xxx.xxx.xxx        (exact)
diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php
index 267d99b..91ec780 100644
--- a/libraries/sqlparser.lib.php
+++ b/libraries/sqlparser.lib.php
@@ -2725,7 +2725,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
     function PMA_SQP_formatNone($arr)
     {
         $formatted_sql = htmlspecialchars($arr['raw']);
-        $formatted_sql = preg_replace("@((\015\012)|(\015)|(\012)) {3,}@", "\n\n", $formatted_sql);
+        $formatted_sql = preg_replace("@((\015\012)|(\015)|(\012)){3,}@", "\n\n", $formatted_sql);
 
         return $formatted_sql;
     } // end of the "PMA_SQP_formatNone()" function


hooks/post-receive
-- 
phpMyAdmin




More information about the Git mailing list