Several fixes for broken actions (sorry for lame text)

[mailer.git] / inc / modules / member / action-themes.php

diff --git a/inc/modules/member/action-themes.php b/inc/modules/member/action-themes.php
index 7dadc2abda6f14e8914f1332b27e45a3de0dc9ad..ba9ab29a93984b4940d0262cf9440fc3fdcbfd2d 100644 (file)
--- a/inc/modules/member/action-themes.php
+++ b/inc/modules/member/action-themes.php
@@ -41,11 +41,11 @@ if (!defined('__SECURITY')) {
        die();
 } elseif (!isMember()) {
        redirectToIndexMemberOnlyModule();
+} elseif (!isBlockModeEnabled()) {
+       // Non-block mode detected
+       return;
 }
 
-// Add description as navigation point
-addMenuDescription('member', __FILE__);
-
 if ((!isExtensionActive('theme')) && (!isAdmin())) {
        loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('theme'));
        return;
@@ -68,7 +68,7 @@ if ($num_themes > 1) {
        $OUT = loadTemplate('theme_one', true, getCurrentThemeName());
 } elseif (isAdmin()) {
        // If there is no theme installed and there's an admin notify him!
-       $OUT = loadTemplate('admin_settings_saved', true, "<div class=\"admin_note\">{--ADMIN_NO_THEME_INSTALLED_WARNING--}</div>");
+       $OUT = '{--ADMIN_NO_THEME_INSTALLED_WARNING--}';
 }
 
 // Load final box template