Fix for broken index and maybe more

[mailer.git] / inc / fatal_errors.php

diff --git a/inc/fatal_errors.php b/inc/fatal_errors.php
index a3a476ca543d5afcbe8069890861785aac2094c4..57d133bec66e1e887f7e8d41638e312a5d65c3ce 100644 (file)
--- a/inc/fatal_errors.php
+++ b/inc/fatal_errors.php
@@ -43,10 +43,10 @@ if (getTotalFatalErrors() > 0) {
 
        // Set unset variable
        if (empty($check)) $check = "";
-       if (isBooleanConstantAndTrue('mxchange_installing')) {
+       if (isInstalling()) {
                // While we are installing ouput other header than while it is installed... :-)
                $OUT = "";
-               foreach ($FATAL as $key => $value) {
+               foreach (getFatalArray() as $key => $value) {
                        // Prepare content for the template
                        $content = array(
                                'key'   => ($key + 1),
@@ -59,10 +59,10 @@ if (getTotalFatalErrors() > 0) {
 
                // Load main template
                LOAD_TEMPLATE("install_fatal_table", false, $OUT);
-       } elseif (isBooleanConstantAndTrue('mxchange_installed')) {
+       } elseif (isInstalled()) {
                // Display all runtime fatal errors
                $OUT = "";
-               foreach ($FATAL as $key => $value) {
+               foreach (getFatalArray() as $key => $value) {
                        // Prepare content for the template
                        $content = array(
                                'key'   => ($key + 1),
@@ -74,15 +74,18 @@ if (getTotalFatalErrors() > 0) {
                }
 
                // Load main template
-               mxchange_die(LOAD_TEMPLATE("runtime_fatal_table", true, $OUT));
+               LOAD_TEMPLATE("runtime_fatal_table", false, $OUT);
+
+               // Abort here
+               exit;
        }
 
        // Message to regular users (non-admin)
-       $CORR = FATAL_REPORT_ERRORS;
+       $CORR = getMessage('FATAL_REPORT_ERRORS');
 
        // PHP warnings fixed
        if ($check == "done") {
-               if (IS_ADMIN()) $CORR = FATAL_CORRECT_ERRORS;
+               if (IS_ADMIN()) $CORR = getMessage('FATAL_CORRECT_ERRORS');
        } // END - if
 
        // Load footer template