From: Tim Yardley <lst@openwrt.org>
Date: Mon, 11 Jun 2007 20:55:36 +0000 (+0000)
Subject: php5 depreciation fixes
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=fdc209bf90f68439a5bee0d8eb3539d07e4e1deb;p=openwrt%2Fsvn-archive%2Farchive.git

php5 depreciation fixes

SVN-Revision: 7574
---

diff --git a/lang/pear-db/patches/100-php5-deprecation-fixes.patch b/lang/pear-db/patches/100-php5-deprecation-fixes.patch
new file mode 100644
index 0000000000..714b678b55
--- /dev/null
+++ b/lang/pear-db/patches/100-php5-deprecation-fixes.patch
@@ -0,0 +1,34 @@
+diff -ubrN DB-1.7.11-orig/DB/common.php DB-1.7.11/DB/common.php
+--- DB-1.7.11-orig/DB/common.php	2007-03-28 02:11:15.000000000 -0500
++++ DB-1.7.11/DB/common.php	2007-06-11 14:49:37.000000000 -0500
+@@ -1014,7 +1014,7 @@
+         if ($result === DB_OK || DB::isError($result)) {
+             return $result;
+         } else {
+-            $tmp =& new DB_result($this, $result);
++            $tmp = new DB_result($this, $result);
+             return $tmp;
+         }
+     }
+@@ -1217,7 +1217,7 @@
+             if ($result === DB_OK || DB::isError($result)) {
+                 return $result;
+             } else {
+-                $tmp =& new DB_result($this, $result);
++                $tmp = new DB_result($this, $result);
+                 return $tmp;
+             }
+         }
+diff -ubrN DB-1.7.11-orig/DB.php DB-1.7.11/DB.php
+--- DB-1.7.11-orig/DB.php	2007-03-28 02:11:15.000000000 -0500
++++ DB-1.7.11/DB.php	2007-06-11 14:49:42.000000000 -0500
+@@ -591,7 +591,8 @@
+      */
+     function isError($value)
+     {
+-        return is_a($value, 'DB_Error');
++        return $value instanceof DB_Error;
++        // return is_a($value, 'DB_Error');
+     }
+ 
+     // }}}