Endless redirect fixed and needless action/what sets removed

[mailer.git] / inc / filters.php

diff --git a/inc/filters.php b/inc/filters.php
index b4970d71b897934a902db27fb937bc76b260219e..35ff120eb7067af5178da838051dafbb9822e897 100644 (file)
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -705,7 +705,7 @@ function FILTER_DETERMINE_WHAT_ACTION () {
                if (!isWhatSet())   setWhat(getWhatFromModule(getModule()));
 
                // Fix 'action' if not yet set
-               if (!isActionSet()) setAction(getModeAction(getModule(), getWhat()));
+               if (!isActionSet()) setAction(getActionFromModuleWhat(getModule(), getWhat()));
        } else {
                // Set action/what to empty
                setAction('');
@@ -717,7 +717,7 @@ function FILTER_DETERMINE_WHAT_ACTION () {
        if ((!isWhatSet()) && (!isActionSet()) && (getOutputMode() != 1) && (getOutputMode() != -1)) {
                if (getModule() == 'admin') {
                        // Set 'action' value to 'login' in admin menu
-                       setAction(getModeAction(getModule(), getWhat()));
+                       setAction(getActionFromModuleWhat(getModule(), getWhat()));
                } elseif ((getModule() == 'index') || (getModule() == 'login')) {
                        // Set 'what' value to 'welcome' in guest and member menu
                        setWhatFromConfig('index_home');
@@ -803,7 +803,7 @@ function FILTER_CHECK_ADMIN_ACL () {
                $action = getAction();
                if (isWhatSet()) {
                        // Get action value by what-value
-                       $action = getModeAction('admin', getWhat());
+                       $action = getActionFromModuleWhat('admin', getWhat());
                } // END - if
 
                // Check for access control line of current menu entry