special phrases: sometimes quotes are not escaped

[nominatim.git] / utils / specialphrases.php

diff --git a/utils/specialphrases.php b/utils/specialphrases.php
index 40fd37500978c3cfe9d6291670fa4ca8e138c15d..c15b857897919fa272b31729bc526813fd6960cd 100644 (file)
--- a/utils/specialphrases.php
+++ b/utils/specialphrases.php
@@ -14,7 +14,7 @@ $aCMDOptions
   );
 getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);
 
-include(CONST_InstallPath.'/settings/phrase_settings.php');
+include(CONST_Phrase_Config);
 
 if ($aCMDResult['wiki-import']) {
     $oNormalizer = Transliterator::createFromRules(CONST_Term_Normalization_Rules);
@@ -39,7 +39,7 @@ if ($aCMDResult['wiki-import']) {
                 $sType = trim($aMatch[3]);
                 // hack around a bug where building=yes was imported with
                 // quotes into the wiki
-                $sType = preg_replace('/"/', '', $sType);
+                $sType = preg_replace('/("|")/', '', $sType);
                 // sanity check, in case somebody added garbage in the wiki
                 if (preg_match('/^\\w+$/', $sClass) < 1
                     || preg_match('/^\\w+$/', $sType) < 1