remove reference assignment where unnecessary

Avoids a number of warnings on PHP7.

diff --git a/lib/db.php b/lib/db.php
index ab578e4b2673f73d00e2b526c304f42f1b08258c..cc84bf9bdaf71df7261aa393721e25c567771336 100644 (file)
--- a/lib/db.php
+++ b/lib/db.php
@@ -4,7 +4,7 @@
        function &getDB($bNew = false, $bPersistent = false)
        {
                // Get the database object
        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);
                if (PEAR::IsError($oDB))
                {
                        var_dump(CONST_Database_DSN);

diff --git a/utils/query.php b/utils/query.php
index 9ab23dc308635df8c9fccd05e85432fe676de9f3..919486adc340503051d10a9d0cdfdb8ab086c7bd 100755 (executable)
--- a/utils/query.php
+++ b/utils/query.php
@@ -32,7 +32,7 @@
         if (isset($aCMDResult['bounded'])) $aCMDResult['bounded'] = 'true';
         if (isset($aCMDResult['nodedupe'])) $aCMDResult['dedupe'] = 'false';
 
         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
         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 5ae604d41e2bb0e61c11b3947ff577cdd8b87530..140319db0a1f915b608781b7b52f8ad3739c8886 100755 (executable)
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -94,7 +94,7 @@
        {
                echo "Create DB\n";
                $bDidSomething = true;
        {
                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.')');
                if (!PEAR::isError($oDB))
                {
                        fail('database already exists ('.CONST_Database_DSN.')');