Ticket #16026: wp_php_5.3.patch

trunk/wp-admin/includes/class-ftp.php

@@ -380 +380 @@
         function pwd() {
                 if(!$this->_exec("PWD", "pwd")) return FALSE;
                 if(!$this->_checkCode()) return FALSE;
-                return ereg_replace("^[0-9]{3} \"(.+)\".+", "\\1", $this->_message);
+                return mb_ereg_replace("^[0-9]{3} \"(.+)\".+", "\\1", $this->_message);
         }
 
         function cdup() {
@@ -424 +424 @@
                 }
                 if(!$this->_exec("SIZE ".$pathname, "filesize")) return FALSE;
                 if(!$this->_checkCode()) return FALSE;
-                return ereg_replace("^[0-9]{3} ([0-9]+)".CRLF, "\\1", $this->_message);
+                return mb_ereg_replace("^[0-9]{3} ([0-9]+)".CRLF, "\\1", $this->_message);
         }
 
         function abort() {
@@ -444 +444 @@
                 }
                 if(!$this->_exec("MDTM ".$pathname, "mdtm")) return FALSE;
                 if(!$this->_checkCode()) return FALSE;
-                $mdtm = ereg_replace("^[0-9]{3} ([0-9]+)".CRLF, "\\1", $this->_message);
+                $mdtm = mb_ereg_replace("^[0-9]{3} ([0-9]+)".CRLF, "\\1", $this->_message);
                 $date = sscanf($mdtm, "%4d%2d%2d%2d%2d%2d");
                 $timestamp = mktime($date[3], $date[4], $date[5], $date[1], $date[2], $date[0]);
                 return $timestamp;
@@ -818 +818 @@
         function glob_regexp($pattern,$probe) {
                 $sensitive=(PHP_OS!='WIN32');
                 return ($sensitive?
-                        ereg($pattern,$probe):
-                        eregi($pattern,$probe)
+                        mb_ereg($pattern,$probe):
+                        mb_eregi($pattern,$probe)
                 );
         }
 

trunk/wp-admin/includes/class-ftp-pure.php

@@ -110 +110 @@
                                 $this->_data_close();
                                 return FALSE;
                         }
-                        $ip_port = explode(",", ereg_replace("^.+ \\(?([0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]+,[0-9]+)\\)?.*".CRLF."$", "\\1", $this->_message));
+                        $ip_port = explode(",", mb_ereg_replace("^.+ \\(?([0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]+,[0-9]+)\\)?.*".CRLF."$", "\\1", $this->_message));
                         $this->_datahost=$ip_port[0].".".$ip_port[1].".".$ip_port[2].".".$ip_port[3];
             $this->_dataport=(((int)$ip_port[4])<<8) + ((int)$ip_port[5]);
                         $this->SendMSG("Connecting to ".$this->_datahost.":".$this->_dataport);

trunk/wp-admin/includes/class-ftp-sockets.php

@@ -131 +131 @@
                                 $this->_data_close();
                                 return FALSE;
                         }
-                        $ip_port = explode(",", ereg_replace("^.+ \\(?([0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]+,[0-9]+)\\)?.*".CRLF."$", "\\1", $this->_message));
+                        $ip_port = explode(",", mb_ereg_replace("^.+ \\(?([0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]+,[0-9]+)\\)?.*".CRLF."$", "\\1", $this->_message));
                         $this->_datahost=$ip_port[0].".".$ip_port[1].".".$ip_port[2].".".$ip_port[3];
             $this->_dataport=(((int)$ip_port[4])<<8) + ((int)$ip_port[5]);
                         $this->SendMSG("Connecting to ".$this->_datahost.":".$this->_dataport);

trunk/wp-includes/class-phpmailer.php

@@ -589 +589 @@
     /* Retry while there is no connection */
     while($index < count($hosts) && $connection == false) {
       $hostinfo = array();
-      if(eregi('^(.+):([0-9]+)$', $hosts[$index], $hostinfo)) {
+      if(mb_eregi('^(.+):([0-9]+)$', $hosts[$index], $hostinfo)) {
         $host = $hostinfo[1];
         $port = $hostinfo[2];
       } else {

trunk/wp-includes/class-pop3.php

@@ -252 +252 @@
         $MsgArray = array();
 
         $line = fgets($fp,$buffer);
-        while ( !ereg("^\.\r\n",$line))
+        while ( !mb_ereg("^\.\r\n",$line))
         {
             $MsgArray[$count] = $line;
             $count++;
@@ -319 +319 @@
             if($msgC > $Total) { break; }
             $line = fgets($fp,$this->BUFFER);
             $line = $this->strip_clf($line);
-            if(ereg("^\.",$line))
+            if(@mb_ereg("^\.",$line))
             {
                 $this->ERROR = "POP3 pop_list: " . _("Premature end of list");
                 return false;
@@ -365 +365 @@
         $MsgArray = array();
 
         $line = fgets($fp,$buffer);
-        while ( !ereg("^\.\r\n",$line))
+        while ( !mb_ereg("^\.\r\n",$line))
         {
             if ( $line[0] == '.' ) { $line = substr($line,1); }
             $MsgArray[$count] = $line;
@@ -553 +553 @@
             $line = "";
             $count = 1;
             $line = fgets($fp,$buffer);
-            while ( !ereg("^\.\r\n",$line)) {
-                if(ereg("^\.\r\n",$line)) {
+            while ( !mb_ereg("^\.\r\n",$line)) {
+                if(mb_ereg("^\.\r\n",$line)) {
                     break;
                 }
                 list ($msg,$msgUidl) = preg_split('/\s+/',$line);
@@ -606 +606 @@
         if( empty($cmd) )
             return false;
         else
-            return( ereg ("^\+OK", $cmd ) );
+            return( mb_ereg ("^\+OK", $cmd ) );
     }
 
     function strip_clf ($text = "") {

trunk/wp-settings.php

@@ -23 +23 @@
 // Set initial default constants including WP_MEMORY_LIMIT, WP_DEBUG, WP_CONTENT_DIR and WP_CACHE.
 wp_initial_constants( );
 
-// Disable magic quotes at runtime. Magic quotes are added using wpdb later in wp-settings.php.
-set_magic_quotes_runtime( 0 );
+// disable magic quotes depending on PHP version
+if (strpos($_SERVER['SERVER_SOFTWARE'], 'PHP/5.3') !== false) {
+        if(get_magic_quotes_runtime()) {
+                set_magic_quotes_runtime(false);}
+        }else{
+                set_magic_quotes_runtime( 0 );
+        }
+
 @ini_set( 'magic_quotes_sybase', 0 );
 
 // Set default timezone in PHP 5.