second argument of array_merge can be empty

This commit is contained in:
Marc Tobias Metten
2016-03-13 03:01:19 +01:00
parent 1d89098f77
commit 22ebd1c7a9
2 changed files with 10 additions and 4 deletions

View File

@@ -1647,8 +1647,11 @@
$oPlaceLookup->setPolygonSimplificationThreshold($this->fPolygonSimplificationThreshold);
$aOutlineResult = $oPlaceLookup->getOutlines($aResult['place_id'], $aResult['lon'], $aResult['lat'], $fDiameter/2);
$aResult = array_merge($aResult, $aOutlineResult);
if ($aOutlineResult)
{
$aResult = array_merge($aResult, $aOutlineResult);
}
if ($aResult['extra_place'] == 'city')
{
$aResult['class'] = 'place';