Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / ClassTypes.php

diff --git a/lib/ClassTypes.php b/lib/ClassTypes.php
index 752db86598d7ddc1aed422e7679b98736b4e1ca3..bb7b0486cb628c687c342faa9faea86a8032ad5c 100644 (file)
--- a/lib/ClassTypes.php
+++ b/lib/ClassTypes.php
@@ -252,13 +252,17 @@ function getIcon($aPlace)
  */
 function getIconFile($aPlace)
 {
  */
 function getIconFile($aPlace)
 {

+    if (CONST_MapIcon_URL === false) {
+        return null;
+    }
+

     $sIcon = getIcon($aPlace);
 
     if (!isset($sIcon)) {
         return null;
     }
 
     $sIcon = getIcon($aPlace);
 
     if (!isset($sIcon)) {
         return null;
     }
 

-    return CONST_Website_BaseURL.'images/mapicons/'.$sIcon.'.p.20.png';
+    return CONST_MapIcon_URL.'/'.$sIcon.'.p.20.png';

 }
 
 /**
 }
 
 /**