Several fixes for module/action/what handling.

[mailer.git] / inc / mysql-manager.php

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index e33b1b395e995c187edbccd29b2fbde77684f250..1f3ea2d2d287f5f7e47ba2b92e39efa2b490eb62 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -1024,9 +1024,14 @@ function getModeAction ($mode, $what) {
        //* DEBUG: */ print(__LINE__.'='.$mode.'/'.$what.'/'.getAction()."=<br />");
        if (!isExtensionInstalledAndNewer('sql_patches', '0.0.5')) {
                // sql_patches is missing so choose depending on mode
-               if ($mode == 'admin') {
+               if (isWhatSet()) {
+                       // Use setted what
+                       $what = getWhat();
+               } elseif ($mode == 'admin') {
+                       // Admin area
                        $what = 'overview';
                } else {
+                       // Everywhere else
                        $what = 'welcome';
                }
        } elseif ((empty($what)) && ($mode != 'admin')) {
@@ -1070,7 +1075,7 @@ function getModeAction ($mode, $what) {
 
                // Free memory
                SQL_FREERESULT($result);
-       } elseif ((!isExtensionInstalled('sql_patches')) && ($mode != 'admin')) {
+       } elseif ((!isExtensionInstalled('sql_patches')) && (($mode != 'admin') && ($mode != 'unknown'))) {
                // No sql_patches installed, but maybe we need to register an admin?
                if (isAdminRegistered()) {
                        // Redirect to admin area