Hotfix

[mailer.git] / inc / filters.php

diff --git a/inc/filters.php b/inc/filters.php
index 36ded8372f0e8a92f9512207895bf7f9189c4314..1900121595308ce218094a20a23754f5a6e24f82 100644 (file)
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -530,7 +530,7 @@ function FILTER_COMPILE_EXPRESSION_CODE ($filterData) {
                                $data = array(
                                        'matches'     => $matches,
                                        'key'         => $key,
-                                       'mode'        => getScriptOutputMode(),
+                                       'output_mode' => getScriptOutputMode(),
                                        'code'        => $filterData,
                                        'callback'    => $callback,
                                        'extra_func'  => $extraFunction,
@@ -603,8 +603,8 @@ function FILTER_RUN_RESET_INCLUDES () {
        // Get more daily reset scripts
        setIncludePool('reset', getArrayFromDirectory('inc/daily/', 'daily_'));
 
-       // Update database
-       if ((!isConfigEntrySet('DEBUG_RESET')) || (!isDebugResetEnabled())) {
+       // Update configuration if this reset is not being debugged
+       if (!isDebugResetEnabled()) {
                updateConfiguration('last_update', 'UNIX_TIMESTAMP()');
        } // END - if
 
@@ -615,7 +615,7 @@ function FILTER_RUN_RESET_INCLUDES () {
                        // Include weekly reset scripts
                        mergeIncludePool('reset', getArrayFromDirectory('inc/weekly/', 'weekly_'));
 
-                       // Update config if not in debug mode
+                       // Update configuration if this reset is not being debugged
                        if (!isWeeklyResetDebugEnabled()) {
                                updateConfiguration('last_week', getWeek());
                        } // END - if
@@ -629,7 +629,7 @@ function FILTER_RUN_RESET_INCLUDES () {
                        // Include monthly reset scripts
                        mergeIncludePool('reset', getArrayFromDirectory('inc/monthly/', 'monthly_'));
 
-                       // Update config
+                       // Update configuration if this reset is not being debugged
                        if (!isMonthlyResetDebugEnabled()) {
                                updateConfiguration('last_month', $currMonth);
                        } // END - if
@@ -1043,7 +1043,7 @@ function FILTER_LOAD_PAGE_HEADER () {
        $GLOBALS['page_header'] = loadTemplate('page_header', true);
 
        // Include meta data in 'guest' module
-       if (getModule() == 'index') {
+       if ((isModuleSet()) && (getModule() == 'index')) {
                // Load meta data template
                $GLOBALS['page_header'] .= loadTemplate('metadata', true);