mirror of
https://github.com/osm-search/Nominatim.git
synced 2026-02-16 15:47:58 +00:00
remove reference assignment where unnecessary
Avoids a number of warnings on PHP7.
This commit is contained in:
@@ -4,7 +4,7 @@
|
|||||||
function &getDB($bNew = false, $bPersistent = false)
|
function &getDB($bNew = false, $bPersistent = false)
|
||||||
{
|
{
|
||||||
// Get the database object
|
// 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))
|
if (PEAR::IsError($oDB))
|
||||||
{
|
{
|
||||||
var_dump(CONST_Database_DSN);
|
var_dump(CONST_Database_DSN);
|
||||||
|
|||||||
@@ -32,7 +32,7 @@
|
|||||||
if (isset($aCMDResult['bounded'])) $aCMDResult['bounded'] = 'true';
|
if (isset($aCMDResult['bounded'])) $aCMDResult['bounded'] = 'true';
|
||||||
if (isset($aCMDResult['nodedupe'])) $aCMDResult['dedupe'] = 'false';
|
if (isset($aCMDResult['nodedupe'])) $aCMDResult['dedupe'] = 'false';
|
||||||
|
|
||||||
$oGeocode =& new Geocode($oDB);
|
$oGeocode = new Geocode($oDB);
|
||||||
if (isset($aCMDResult['accept-language']) && $aCMDResult['accept-language'])
|
if (isset($aCMDResult['accept-language']) && $aCMDResult['accept-language'])
|
||||||
$oGeocode->setLanguagePreference(getPreferredLanguages($aCMDResult['accept-language']));
|
$oGeocode->setLanguagePreference(getPreferredLanguages($aCMDResult['accept-language']));
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -94,7 +94,7 @@
|
|||||||
{
|
{
|
||||||
echo "Create DB\n";
|
echo "Create DB\n";
|
||||||
$bDidSomething = true;
|
$bDidSomething = true;
|
||||||
$oDB =& DB::connect(CONST_Database_DSN, false);
|
$oDB = DB::connect(CONST_Database_DSN, false);
|
||||||
if (!PEAR::isError($oDB))
|
if (!PEAR::isError($oDB))
|
||||||
{
|
{
|
||||||
fail('database already exists ('.CONST_Database_DSN.')');
|
fail('database already exists ('.CONST_Database_DSN.')');
|
||||||
|
|||||||
Reference in New Issue
Block a user