From 70997a9554262c8559731b55f0e300b2de9eed14 Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Sat, 4 Jun 2016 23:46:19 +0200 Subject: [PATCH] remove reference assignment where unnecessary Avoids a number of warnings on PHP7. --- lib/db.php | 2 +- utils/query.php | 2 +- utils/setup.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/db.php b/lib/db.php index d7c85e7b..7d90ab10 100644 --- 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 b3fdb268..c752f9f1 100755 --- 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 b66d19bb..54526f7e 100755 --- 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.')'); -- 2.45.2