Fixes for extension problems while installing/removing (still double-registration...

[mailer.git] / admin.php

diff --git a/admin.php b/admin.php
index 9ae71294abbc7626a6f0edbb36e9f74ccbd50195..410750546d207d7e17bcbf61f11ad16af14b7ac2 100644 (file)
--- a/admin.php
+++ b/admin.php
@@ -39,34 +39,27 @@
 // Load security stuff here
 require('inc/libs/security_functions.php');
 
-// Init "action" and "what"
-$GLOBALS['what'] = '';
-$GLOBALS['action'] = '';
-
 // Set module
 $GLOBALS['module'] = 'admin';
 $GLOBALS['output_mode'] = -1;
 
 // Load the required file(s)
-require('inc/config.php');
+require('inc/config-global.php');
 
 // Is the script installed?
-if (isInstalled()) {
-       // Is the admin logged-in and no sql_patches installed?
-       if ((IS_ADMIN()) && (!EXT_IS_ACTIVE('sql_patches'))) {
-               // Extension 'sql_patches' is missing!
-               redirectToUrl('modules.php?module=admin&sql_patches=1');
-       } else {
-               // Default redirect
-               redirectToUrl('modules.php?module=admin');
-       }
-} else {
+if (!isInstalled()) {
        // You have to install first!
        redirectToUrl('install.php');
-}
+} // END - if
 
-// Really all done here... ;-)
-shutdown();
+// Is the admin logged-in and no sql_patches installed?
+if ((IS_ADMIN()) && (!EXT_IS_ACTIVE('sql_patches'))) {
+       // Extension 'sql_patches' is missing!
+       redirectToUrl('modules.php?module=admin&sql_patches=1');
+} else {
+       // Default redirect
+       redirectToUrl('modules.php?module=admin');
+}
 
-//
+// [EOF]
 ?>