[patch] Patch to get horde & friends working correctly with PHP 4.4

horde.patch (text/plain), 3.87 KB, created by Jason Frank on 2005-08-03 09:26:06 UTC

diff -r --unified /var/www/localhost/htdocs/horde/kronolith/lib/Driver/sql.php /var/www/localhost/htdocs/horde2/kronolith/lib/Driver/sql.php
--- /var/www/localhost/htdocs/horde/kronolith/lib/Driver/sql.php	2005-08-01 13:50:32.984583723 -0500
+++ /var/www/localhost/htdocs/horde2/kronolith/lib/Driver/sql.php	2005-08-01 13:42:26.264205782 -0500
@@ -166,8 +166,7 @@
                 return false;
             }
         } else {
-            $tempClass =  new Kronolith_Event_sql($this);
-            return $tempClass;
+            return new Kronolith_Event_sql($this);
         }
     }
 
diff -r --unified /var/www/localhost/htdocs/horde/kronolith/lib/Driver.php /var/www/localhost/htdocs/horde2/kronolith/lib/Driver.php
--- /var/www/localhost/htdocs/horde/kronolith/lib/Driver.php	2005-08-01 13:47:54.048931405 -0500
+++ /var/www/localhost/htdocs/horde2/kronolith/lib/Driver.php	2005-08-01 13:42:26.274203181 -0500
@@ -68,8 +68,7 @@
         include_once dirname(__FILE__) . '/Driver/' . $driver . '.php';
         $class = 'Kronolith_Driver_' . $driver;
         if (class_exists($class)) {
-            $tempClass = new $class($params);
-	    return $tempClass;
+            return new $class($params);
         } else {
             Horde::fatal(new PEAR_Error(sprintf(_("Unable to load the definition of %s."), $class)), __FILE__, __LINE__);
         }
diff -r --unified /var/www/localhost/htdocs/horde/lib/Auth.php /var/www/localhost/htdocs/horde2/lib/Auth.php
--- /var/www/localhost/htdocs/horde/lib/Auth.php	2005-08-01 13:45:56.797434804 -0500
+++ /var/www/localhost/htdocs/horde2/lib/Auth.php	2005-08-01 13:45:22.764288650 -0500
@@ -77,8 +77,7 @@
         }
         $class = 'Auth_' . $driver;
         if (class_exists($class)) {
-	    $tempClass = new $class($params);
-            return $tempClass;
+            return new $class($params);
         } else {
             return PEAR::raiseError('Class definition of ' . $class . ' not found.');
         }
diff -r --unified /var/www/localhost/htdocs/horde/lib/Prefs.php /var/www/localhost/htdocs/horde2/lib/Prefs.php
--- /var/www/localhost/htdocs/horde/lib/Prefs.php	2005-08-01 13:46:18.038908758 -0500
+++ /var/www/localhost/htdocs/horde2/lib/Prefs.php	2005-08-01 13:45:32.768685970 -0500
@@ -141,8 +141,7 @@
         /* Return a base Prefs object if no driver is specified. */
         $driver = strtolower(basename($driver));
         if (empty($driver) || (strcmp($driver, 'none') == 0)) {
-            $tempClass = new Prefs;
-	    return $tempClass;
+            return new Prefs;
         }
 
         /* If $params['user_hook'] is defined, use it to retrieve the
diff -r --unified /var/www/localhost/htdocs/horde/mnemo/lib/Driver.php /var/www/localhost/htdocs/horde2/mnemo/lib/Driver.php
--- /var/www/localhost/htdocs/horde/mnemo/lib/Driver.php	2005-08-01 13:48:27.569210984 -0500
+++ /var/www/localhost/htdocs/horde2/mnemo/lib/Driver.php	2005-08-01 13:42:26.779071837 -0500
@@ -61,8 +61,7 @@
         include_once dirname(__FILE__) . '/Driver/' . $driver . '.php';
         $class = 'Mnemo_Driver_' . $driver;
         if (class_exists($class)) {
-            $tempClass = new $class($user, $params);
-	    return $tempClass;
+            return new $class($user, $params);
         } else {
             return false;
         }
diff -r --unified /var/www/localhost/htdocs/horde/nag/lib/Driver.php /var/www/localhost/htdocs/horde2/nag/lib/Driver.php
--- /var/www/localhost/htdocs/horde/nag/lib/Driver.php	2005-08-01 13:49:13.970139615 -0500
+++ /var/www/localhost/htdocs/horde2/nag/lib/Driver.php	2005-08-01 13:42:27.128980807 -0500
@@ -61,8 +61,7 @@
         include_once dirname(__FILE__) . '/Driver/' . $driver . '.php';
         $class = 'Nag_Driver_' . $driver;
         if (class_exists($class)) {
-            $tempClass = new $class($user, $params);
-	    return $tempClass;
+            return new $class($user, $params);
         } else {
             return false;
         }