[geeklog-hg] geeklog: Backed out changeset: 2f4461f5ecb4 since it broke a uni...

[geeklog-cvs at lists.geeklog.net]

changeset 8776:ff955fa6bae5
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/ff955fa6bae5
user: Tom <websitemaster at cogeco.net>
date: Wed Jul 11 14:19:22 2012 -0400
description:
Backed out changeset: 2f4461f5ecb4 since it broke a unit test

diffstat:

 public_html/admin/install/configinfo.php |  2 +-
 public_html/lib-common.php               |  8 ++++----
 system/databases/mssql.class.php         |  6 +++---
 system/lib-mbyte.php                     |  4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diffs (88 lines):

diff -r 2f4461f5ecb4 -r ff955fa6bae5 public_html/admin/install/configinfo.php
--- a/public_html/admin/install/configinfo.php	Tue Jul 10 20:51:45 2012 +0900
+++ b/public_html/admin/install/configinfo.php	Wed Jul 11 14:19:22 2012 -0400
@@ -79,7 +79,7 @@
         ob_end_clean();
     } elseif (is_bool($value)) {
         $value = ($value === false) ? 'false' : 'true';
-    } elseif (preg_match('/[a-z]+html/i', $option)) {
+    } elseif (eregi('[a-z]+html', $option)) {
         $value = htmlentities($value);
     } elseif (!isset($value)) {
         $value = ' ';
diff -r 2f4461f5ecb4 -r ff955fa6bae5 public_html/lib-common.php
--- a/public_html/lib-common.php	Tue Jul 10 20:51:45 2012 +0900
+++ b/public_html/lib-common.php	Wed Jul 11 14:19:22 2012 -0400
@@ -6861,8 +6861,8 @@
     switch( $interval )
     {
         case "y":
-            list($year1, $month1, $day1) = explode('-', date('Y-m-d', $date1));
-            list($year2, $month2, $day2) = explode('-', date('Y-m-d', $date2));
+            list($year1, $month1, $day1) = split('-', date('Y-m-d', $date1));
+            list($year2, $month2, $day2) = split('-', date('Y-m-d', $date2));
             $time1 = (date('H',$date1)*3600) + (date('i',$date1)*60) + (date('s',$date1));
             $time2 = (date('H',$date2)*3600) + (date('i',$date2)*60) + (date('s',$date2));
             $diff = $year2 - $year1;
@@ -6879,8 +6879,8 @@
             }
             break;
         case "m":
-            list($year1, $month1, $day1) = explode('-', date('Y-m-d', $date1));
-            list($year2, $month2, $day2) = explode('-', date('Y-m-d', $date2));
+            list($year1, $month1, $day1) = split('-', date('Y-m-d', $date1));
+            list($year2, $month2, $day2) = split('-', date('Y-m-d', $date2));
             $time1 = (date('H',$date1)*3600) + (date('i',$date1)*60) + (date('s',$date1));
             $time2 = (date('H',$date2)*3600) + (date('i',$date2)*60) + (date('s',$date2));
             $diff = ($year2 * 12 + $month2) - ($year1 * 12 + $month1);
diff -r 2f4461f5ecb4 -r ff955fa6bae5 system/databases/mssql.class.php
--- a/system/databases/mssql.class.php	Tue Jul 10 20:51:45 2012 +0900
+++ b/system/databases/mssql.class.php	Wed Jul 11 14:19:22 2012 -0400
@@ -367,7 +367,7 @@
                 $testSQL=substr($sql,0,$isIn);
                 
                 $limitclause=trim($limitclause);
-                preg_match('/limit ([^,]+),(.*)/i', $limitclause, $arrayStr); 
+                eregi("limit ([^,]+),(.*)", $limitclause,$arrayStr); 
                 
                 $left=trim($arrayStr[1]);
                 $rightStr=trim($arrayStr[2]);
@@ -1047,7 +1047,7 @@
                 $rightStr=ltrim(substr($string,$startLoc+8,strlen($string)));
 
                 //eregi("\((.*),([^\)]+\))", $rightStr,$left); 
-                 preg_match("/\(([^,]+),([^\)]+\))/i", $rightStr, $left); 
+                 eregi("\(([^,]+),([^\)]+\))", $rightStr,$left); 
                 
               
                  
@@ -1073,7 +1073,7 @@
                     $replaceString='DATE_SUB(' . $firstParm . ',' . $left[2] . ')';
                     }
  
-                $secondParmArray= explode(' ', $secondParm);
+                $secondParmArray=split(" ",$secondParm);
                 $intervalTime=$secondParmArray[1];
                 $typeForInterval=$secondParmArray[2];
                 if($intervalTime>0){
diff -r 2f4461f5ecb4 -r ff955fa6bae5 system/lib-mbyte.php
--- a/system/lib-mbyte.php	Tue Jul 10 20:51:45 2012 +0900
+++ b/system/lib-mbyte.php	Wed Jul 11 14:19:22 2012 -0400
@@ -224,7 +224,7 @@
     if ($mb_enabled) {
         $result = mb_eregi($pattern, $str, $regs);
     } else {
-        $result = preg_match('/' . $pattern . '/i', $str, $regs);
+        $result = eregi($pattern, $str, $regs);
     }
 
     return $result;
@@ -240,7 +240,7 @@
     if ($mb_enabled) {
         $result = mb_eregi_replace($pattern, $replace, $str);
     } else {
-        $result = preg_replace('/' . $pattern . '/i', $replace, $str);
+        $result = eregi_replace($pattern, $replace, $str);
     }
 
     return $result;