Further fixes for installation phase and endless loop

[mailer.git] / inc / filters.php

diff --git a/inc/filters.php b/inc/filters.php
index 1d7a5004760d661695a464d82faa6a6a84cd918f..1b26cddabb587c8d6bdbb2372242e0cbc950aad2 100644 (file)
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -580,6 +580,16 @@ function FILTER_HTML_INCLUDE_USERS ($mode) {
 
 // Filter for determining what/action/module
 function FILTER_DETERMINE_WHAT_ACTION () {
+       // In installation phase we don't have what/action
+       if (isInstallationPhase()) {
+               // Set both to empty
+               setAction('');
+               setWhat('');
+
+               // Abort here
+               return;
+       } // END - if
+
        // Get all values
        if ((getOutputMode() != 1) && (getOutputMode() != -1)) {
                // Fix module