Global fix/add/update:

[mailer.git] / index.php

diff --git a/index.php b/index.php
index f717dd4fabf5277770af16eee9cb5ded8b80ae7e..979aa45f3d9642dd186e00ad7557abc7a78d540f 100644 (file)
--- a/index.php
+++ b/index.php
@@ -62,13 +62,13 @@ final class ApplicationEntryPoint {
         */
        public static function app_die ($message = '', $code = false, $extraData = '', $silentMode = false) {
                // Is this method already called?
-               if (defined('EMERGENCY_EXIT_CALLED')) {
+               if (isset($GLOBALS['app_die_called'])) {
                        // Then output the text directly
                        die($message);
                } // END - if
 
                // This method shall not be called twice
-               define('EMERGENCY_EXIT_CALLED', true);
+               $GLOBALS['app_die_called'] = true;
 
                // Is a message set?
                if (empty($message)) {
@@ -86,14 +86,14 @@ final class ApplicationEntryPoint {
                } // END - if
 
                // Get some instances
-               $tpl = FrameworkConfiguration::getInstance()->getConfigEntry('template_class');
-               $lang = LanguageSystem::getInstance();
+               $tpl = FrameworkConfiguration::getInstance()->getConfigEntry('web_template_class');
+               $languageInstance = LanguageSystem::getInstance();
 
                // Get response instance
                $responseInstance = ApplicationHelper::getInstance()->getResponseInstance();
 
                // Is the template engine loaded?
-               if ((class_exists($tpl)) && (is_object($lang))) {
+               if ((class_exists($tpl)) && (is_object($languageInstance))) {
                        // Use the template engine for putting out (nicer look) the message
                        try {
                                // Get the template instance from our object factory
@@ -133,7 +133,7 @@ final class ApplicationEntryPoint {
                        $templateInstance->assignVariable('backtrace', $backtrace);
                        $templateInstance->assignVariable('total_includes', ClassLoader::getInstance()->getTotal());
                        $templateInstance->assignVariable('total_objects', ObjectFactory::getTotal());
-                       $templateInstance->assignVariable('title', $lang->getMessage('emergency_exit_title'));
+                       $templateInstance->assignVariable('title', $languageInstance->getMessage('emergency_exit_title'));
 
                        // Load the template
                        $templateInstance->loadCodeTemplate('emergency_exit');