Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / DebugHtml.php

diff --git a/lib/DebugHtml.php b/lib/DebugHtml.php
index ff1724d2a61a76ec6f674fedeb456f1c6feba19d..98da8794055c644e23fbb90ffdbbc6d3d5b45f8e 100644 (file)
--- a/lib/DebugHtml.php
+++ b/lib/DebugHtml.php
@@ -153,6 +153,10 @@ class Debug
                     $sPre = ', ';
                 }
             }
+        } elseif (is_object($mVar) && method_exists($mVar, 'debugInfo')) {
+            Debug::outputVar($mVar->debugInfo(), $sPreNL);
+        } elseif (is_a($mVar, 'stdClass')) {
+            Debug::outputVar(json_decode(json_encode($mVar), true), $sPreNL);
         } else {
             Debug::outputSimpleVar($mVar);
         }