Next stage of HTML rewriting, lesser br-tags

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

diff --git a/inc/modules/admin/what-extensions.php b/inc/modules/admin/what-extensions.php
index 8a03e6c322abfb84268e25e486629ce33c326d06..629cd10d5cf267703cbf53d6638f22919d8d86ca 100644 (file)
--- a/inc/modules/admin/what-extensions.php
+++ b/inc/modules/admin/what-extensions.php
@@ -55,8 +55,9 @@ if (isGetRequestElementSet('reg_ext')) {
        // De-/activate extensions
        foreach (postRequestElement('sel') as $ext_id => $active) {
                // Shall we keep the extension always active?
-               if ((isset($GLOBALS['cache_array']['active_extensions'][getExtensionName($ext_id)])) && ($GLOBALS['cache_array']['active_extensions'][getExtensionName($ext_id)] == 'Y') && ($active != 'Y')) {
+               if ((isset($GLOBALS['cache_array']['always_active'][getExtensionName($ext_id)])) && ($GLOBALS['cache_array']['always_active'][getExtensionName($ext_id)] == 'Y') && ($active == 'Y')) {
                        // Keep this extension active!
+                       loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_EXTENSION_ALWAYS_ACTIVE'), getExtensionName($ext_id)));
                } else {
                        // De/activate extension
                        $ACT = 'N'; setExtensionMode('deactivate');
@@ -303,6 +304,8 @@ ORDER BY `ext_name` ASC", __FILE__, __LINE__);
                        $result = SQL_QUERY_ESC("SELECT `subject` FROM `{?_MYSQL_PREFIX?}_task_system` WHERE `id`=%s LIMIT 1",
                                array(bigintval($ext_id)), __FILE__, __LINE__);
                        list($subj) = SQL_FETCHROW($result);
+
+                       // Free result
                        SQL_FREERESULT($result);
 
                        // Disable cache update by default