X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-overview.php;h=d532a27f7cc635556af63c6113fa43704c0afa16;hb=ff9e8f739bd4b6e184b2a6bf427334196e501da8;hp=fe87639e61422245eb43800afbc41afaf97e6dd6;hpb=263a089d8a499e0e26d0af9e7aa7639f88b8ca60;p=mailer.git

diff --git a/inc/modules/admin/what-overview.php b/inc/modules/admin/what-overview.php
index fe87639e61..d532a27f7c 100644
--- a/inc/modules/admin/what-overview.php
+++ b/inc/modules/admin/what-overview.php
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -47,7 +48,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // Is sql_patches not yet installed?
 if (!isExtensionInstalled('sql_patches')) {
 	// Output warning
-	loadTemplate('admin_settings_saved', false, getMessage('ADMIN_WARNING_SQL_PATCHES_MISSING'));
+	loadTemplate('admin_settings_saved', false, '{--ADMIN_WARNING_SQL_PATCHES_MISSING--}');
 } // END - if
 
  // Load include file 'overview-inc' (old standard overview page)
@@ -58,7 +59,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 +72,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,8 +94,8 @@ 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_EXTENSION_INACTIVE', 'task'));
+	} // END - if
 
 	// List selected tasks on overview when task management is not active
 	outputSeletectedTasks(postRequestArray(), $result_tasks);