More fixes for installation and extension registration

[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 fe87639e61422245eb43800afbc41afaf97e6dd6..3805b7734dce44e817784d0c4548e69d34ce0d31 100644 (file)
--- a/inc/modules/admin/what-overview.php
+++ b/inc/modules/admin/what-overview.php
@@ -58,7 +58,7 @@ $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 (getAction() == 'login') {
-       if (isExtensionActive('task')) {
+       if ((isExtensionActive('task')) && (function_exists('outputAdvancedOverview'))) {
                // When task extension is registered output advanced overview page
                $jobsDone = outputAdvancedOverview($result_tasks); // This function is provided by the extension 'task'
                $taskExt = true;
@@ -71,7 +71,7 @@ if (getAction() == 'login') {
 // Are we in 'welcome' page and are there jobs to be done?
 if (!ifAdminMenuHasEntries(getAction())) {
        // This menu is empty and so no content is displayed
-       loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_MENU_IS_EMPTY'), getAction()));
+       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_MENU_IS_EMPTY', getAction()));
 } elseif ($jobsDone === true) {
        // Generate overview of all main menus
        if ((is_array($GLOBALS['menu']['description'])) && (count($GLOBALS['menu']['description']) > 0)) {
@@ -93,7 +93,7 @@ if (!ifAdminMenuHasEntries(getAction())) {
 } elseif ($taskExt === false) {
        if (isExtensionActive('task')) {
                // Output warning message
-               loadTemplate('admin_settings_saved', false, sprintf(getMessage('EXTENSION_WARNING_EXT_INACTIVE'), 'task'));
+               loadTemplate('admin_settings_saved', false, getMaskedMessage('EXTENSION_WARNING_EXT_INACTIVE', 'task'));
        }
 
        // List selected tasks on overview when task management is not active