From 77e2387d94b7f6c9574cbed8a5d242628391906c Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 13 May 2012 20:49:39 +0200
Subject: more MDB2 updates

---
 3rdparty/PEAR/Autoloader.php               | 2 +-
 3rdparty/PEAR/Command.php                  | 6 +++---
 3rdparty/PEAR/Common.php                   | 2 +-
 3rdparty/PEAR/PackageFile/Generator/v1.php | 2 +-
 3rdparty/PEAR/PackageFile/Generator/v2.php | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

(limited to '3rdparty/PEAR')

diff --git a/3rdparty/PEAR/Autoloader.php b/3rdparty/PEAR/Autoloader.php
index 0ed707ec842..51620c7085f 100644
--- a/3rdparty/PEAR/Autoloader.php
+++ b/3rdparty/PEAR/Autoloader.php
@@ -144,7 +144,7 @@ class PEAR_Autoloader extends PEAR
             $include_file = preg_replace('/[^a-z0-9]/i', '_', $classname);
             include_once $include_file;
         }
-        $obj =& new $classname;
+        $obj = new $classname;
         $methods = get_class_methods($classname);
         foreach ($methods as $method) {
             // don't import priviate methods and constructors
diff --git a/3rdparty/PEAR/Command.php b/3rdparty/PEAR/Command.php
index db39b8f36f3..13518d4e4b2 100644
--- a/3rdparty/PEAR/Command.php
+++ b/3rdparty/PEAR/Command.php
@@ -133,8 +133,8 @@ class PEAR_Command
             $a = PEAR::raiseError("unknown command `$command'");
             return $a;
         }
-        $ui =& PEAR_Command::getFrontendObject();
-        $obj = &new $class($ui, $config);
+        $ui = PEAR_Command::getFrontendObject();
+        $obj = new $class($ui, $config);
         return $obj;
     }
 
@@ -149,7 +149,7 @@ class PEAR_Command
         if (!class_exists($class)) {
             return PEAR::raiseError("unknown command `$command'");
         }
-        $ui =& PEAR_Command::getFrontendObject();
+        $ui = PEAR_Command::getFrontendObject();
         $config = &PEAR_Config::singleton();
         $obj = &new $class($ui, $config);
         return $obj;
diff --git a/3rdparty/PEAR/Common.php b/3rdparty/PEAR/Common.php
index 3a8c7e80d33..83f2de742ac 100644
--- a/3rdparty/PEAR/Common.php
+++ b/3rdparty/PEAR/Common.php
@@ -168,7 +168,7 @@ class PEAR_Common extends PEAR
     function PEAR_Common()
     {
         parent::PEAR();
-        $this->config = &PEAR_Config::singleton();
+        $this->config = PEAR_Config::singleton();
         $this->debug = $this->config->get('verbose');
     }
 
diff --git a/3rdparty/PEAR/PackageFile/Generator/v1.php b/3rdparty/PEAR/PackageFile/Generator/v1.php
index 2f42f178d59..69a4818799e 100644
--- a/3rdparty/PEAR/PackageFile/Generator/v1.php
+++ b/3rdparty/PEAR/PackageFile/Generator/v1.php
@@ -109,7 +109,7 @@ class PEAR_PackageFile_Generator_v1
         // }}}
         $packagexml = $this->toPackageFile($where, PEAR_VALIDATE_PACKAGING, 'package.xml', true);
         if ($packagexml) {
-            $tar =& new Archive_Tar($dest_package, $compress);
+            $tar = new Archive_Tar($dest_package, $compress);
             $tar->setErrorHandling(PEAR_ERROR_RETURN); // XXX Don't print errors
             // ----- Creates with the package.xml file
             $ok = $tar->createModify(array($packagexml), '', $where);
diff --git a/3rdparty/PEAR/PackageFile/Generator/v2.php b/3rdparty/PEAR/PackageFile/Generator/v2.php
index 4d202df27d3..8250e0ac4d0 100644
--- a/3rdparty/PEAR/PackageFile/Generator/v2.php
+++ b/3rdparty/PEAR/PackageFile/Generator/v2.php
@@ -269,7 +269,7 @@ http://pear.php.net/dtd/package-2.0.xsd',
         $name       = $pf1 !== null ? 'package2.xml' : 'package.xml';
         $packagexml = $this->toPackageFile($where, PEAR_VALIDATE_PACKAGING, $name);
         if ($packagexml) {
-            $tar =& new Archive_Tar($dest_package, $compress);
+            $tar = new Archive_Tar($dest_package, $compress);
             $tar->setErrorHandling(PEAR_ERROR_RETURN); // XXX Don't print errors
             // ----- Creates with the package.xml file
             $ok = $tar->createModify(array($packagexml), '', $where);
-- 
cgit v1.2.3