Fixed a version problem which causes admin logins to fail if ext-admins is installed

[mailer.git] / inc / modules / admin / what-overview.php

diff --git a/inc/modules/admin/what-overview.php b/inc/modules/admin/what-overview.php
index 7214a8482e95c37e755baffdf5864d241984936f..9176b32204b276a1f5776ca0d4c6c514b28c5a20 100644 (file)
--- a/inc/modules/admin/what-overview.php
+++ b/inc/modules/admin/what-overview.php
@@ -48,28 +48,30 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 // Otherwise load include file 'overview-inc' (old standard overview page)
 LOAD_INC_ONCE("inc/modules/admin/overview-inc.php");
 
-$JOBS_DONE = true;
+$jobsDone = true;
 $taskExt = false; // Default is that "task" is not installed
 
 // When the admin is logging in check several things first (new jobs to complete and so on)
 if ($GLOBALS['action'] == "login") {
        if (EXT_IS_ACTIVE("task")) {
                // When task extension is registered output advanced overview page
-               $JOBS_DONE = OUTPUT_ADVANCED_OVERVIEW($result_tasks); // This function is provided by the extension 'task'
+               $jobsDone = OUTPUT_ADVANCED_OVERVIEW($result_tasks); // This function is provided by the extension 'task'
                $taskExt = true;
        } else {
                // Output standart overview (provided by overview-inc.php)
-               $JOBS_DONE = OUTPUT_STANDARD_OVERVIEW($result_tasks);
+               $jobsDone = OUTPUT_STANDARD_OVERVIEW($result_tasks);
        }
 } // END - if
 
-// Are there jobs to be done?
-if ($JOBS_DONE) {
+// Are we in 'welcome' page and are there jobs to be done?
+if ($GLOBALS['action'] != "login") {
+       // This menu is empty and so no content is displayed
+       LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('ADMIN_MENU_IS_EMPTY'), $GLOBALS['action']));
+} elseif ($jobsDone === true) {
        // Generate overview of all main menus
        if ((is_array($GLOBALS['menu']['description'])) && (count($GLOBALS['menu']['description']) > 0)) {
                $OUT = "";
-               foreach ($GLOBALS['menu']['description'] as $key => $value)
-               {
+               foreach ($GLOBALS['menu']['description'] as $key => $value) {
                        // Prepare content
                        $content = array(
                                'title' => $GLOBALS['menu']['title'][$key],
@@ -78,7 +80,7 @@ if ($JOBS_DONE) {
 
                        // Load row template
                        $OUT .= LOAD_TEMPLATE("admin_menu_hints_row", true, $content);
-               }
+               } // END - foreach
 
                // Load base template
                LOAD_TEMPLATE("admin_menu_hints", false, $OUT);