From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sat, 4 Jun 2016 21:46:19 +0000 (+0200)
Subject: remove reference assignment where unnecessary
X-Git-Tag: v3.0.0~169
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/2156fb1ad7978214577bfbd2d3d8d755d2c14049

remove reference assignment where unnecessary

Avoids a number of warnings on PHP7.
---

diff --git a/lib/db.php b/lib/db.php
index ab578e4b..cc84bf9b 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 9ab23dc3..919486ad 100755
--- 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';
 
-        $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 5ae604d4..140319db 100755
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -94,7 +94,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.')');