Several fixes for guest menu system and template engine

[mailer.git] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index 60efa3138edc088eca19193615a0e0b88586f5fa..ee2d1b41adb73c6ebc67b3dd1069bd01b73cc6a8 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -197,6 +197,7 @@ function addFatalMessage ($F, $L, $message, $extra='') {
        $GLOBALS['fatal_messages'][] = $message;
 
        // Log fatal messages away
+       debug_report_bug($message);
        logDebugMessage($F, $L, " message={$message}");
 }
 
@@ -362,8 +363,9 @@ function loadTemplate ($template, $return=false, $content=array()) {
                                        $eval = '$ret = "' . compileCode(smartAddSlashes($GLOBALS['tpl_content'])) . '";';
                                }
                        } else {
-                               // Simply return loaded code
-                               $eval = '$ret = $GLOBALS[\'tpl_content\'];';
+                               // Add surrounding HTML comments to help finding bugs faster
+                               $ret = "<!-- Template " . $template . " - Start -->\n" . $GLOBALS['tpl_content'] . "<!-- Template " . $template . " - End -->\n";
+                               $eval = '$ret = "' . smartAddSlashes($ret) . '";';
                        } // END - if
 
                        // Cache the eval() command here