remove reference assignment where unnecessary

Avoids a number of warnings on PHP7.

diff --git a/lib/db.php b/lib/db.php
index d7c85e7b6df684f850c9e283bc3e2a29195689f9..7d90ab106575f69a32eb091cb8fc7c31cef98b2e 100644 (file)
--- a/lib/db.php
+++ b/lib/db.php
@@ -4,7 +4,7 @@
        function &getDB($bNew = false, $bPersistent = false)
        {
                // Get the database object
-               $oDB =& DB::connect(CONST_Database_DSN.($bNew?'?new_link=true':''), $bPersistent);
+               $oDB = DB::connect(CONST_Database_DSN.($bNew?'?new_link=true':''), $bPersistent);
                if (PEAR::IsError($oDB))
                {
                        var_dump(CONST_Database_DSN);

diff --git a/utils/query.php b/utils/query.php
index b3fdb2683d9bf9f097f322b583e01497badf8edd..c752f9f17f2a987324d13b771dd96b21a77a2103 100755 (executable)
--- a/utils/query.php
+++ b/utils/query.php
@@ -31,7 +31,7 @@
         if (isset($aCMDResult['bounded'])) $aCMDResult['bounded'] = 'true';
         if (isset($aCMDResult['nodedupe'])) $aCMDResult['dedupe'] = 'false';
 
-        $oGeocode =& new Geocode($oDB);
+        $oGeocode = new Geocode($oDB);
         if (isset($aCMDResult['accept-language']) && $aCMDResult['accept-language'])
             $oGeocode->setLanguagePreference(getPreferredLanguages($aCMDResult['accept-language']));
         else

diff --git a/utils/setup.php b/utils/setup.php
index b66d19bb5b102e78a34bab2ff7345ebc652d936b..54526f7e9c14d0d3a30f935e23d79fe8f1439c4f 100755 (executable)
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -97,7 +97,7 @@
        {
                echo "Create DB\n";
                $bDidSomething = true;
-               $oDB =& DB::connect(CONST_Database_DSN, false);
+               $oDB = DB::connect(CONST_Database_DSN, false);
                if (!PEAR::isError($oDB))
                {
                        fail('database already exists ('.CONST_Database_DSN.')');