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 3980ef00ccc6db36cf9aa8bd108362a70fbc2205..629cd10d5cf267703cbf53d6638f22919d8d86ca 100644 (file)
--- a/inc/modules/admin/what-extensions.php
+++ b/inc/modules/admin/what-extensions.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
  * Mailer v0.2.1-FINAL                                Start: 03/22/2004 *
- * ================                             Last change: 12/13/2004 *
+ * ===================                          Last change: 12/13/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-extentions.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');
@@ -260,7 +261,7 @@ ORDER BY `ext_name` ASC", __FILE__, __LINE__);
                        while ($content = SQL_FETCHARRAY($result)) {
                                // Prepare CSS selection output
                                $cssSelection = '---';
-                               if (getExtensionVersion('sql_patches') >= '0.0.6') $cssSelection = translateYesNo($content['ext_css']);
+                               if (isExtensionInstalledAndNewer('sql_patches', '0.0.6')) $cssSelection = translateYesNo($content['ext_css']);
 
                                // Prepare data for the row template
                                $content = array(
@@ -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