Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib-php / DebugHtml.php

diff --git a/lib-php/DebugHtml.php b/lib-php/DebugHtml.php
index 2207d52915cfcefcb66184d8f6197d72d019af70..7b0cba2d0e569114a90d7f446ac5543717e6a923 100644 (file)
--- a/lib-php/DebugHtml.php
+++ b/lib-php/DebugHtml.php
@@ -135,7 +135,7 @@ class Debug
 
     public static function printSQL($sSQL)
     {
 
     public static function printSQL($sSQL)
     {

-        echo '<p><tt><b>'.date('c').'</b> <font color="#aaa">'.htmlspecialchars($sSQL).'</font></tt></p>'."\n";
+        echo '<p><tt><b>'.date('c').'</b> <font color="#aaa">'.htmlspecialchars($sSQL, ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML401).'</font></tt></p>'."\n";

     }
 
     private static function outputVar($mVar, $sPreNL)
     }
 
     private static function outputVar($mVar, $sPreNL)


@@ -183,7 +183,7 @@ class Debug
             $sOut = (string)$mVar;
         }
 
             $sOut = (string)$mVar;
         }
 

-        echo htmlspecialchars($sOut);
+        echo htmlspecialchars($sOut, ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML401);

         return strlen($sOut);
     }
 }
         return strlen($sOut);
     }
 }