Fix/Rewrite for getMaskedMessage() error, thanks to meinnimbuzz

diff --git a/inc/modules/login.php b/inc/modules/login.php
index 4e91d9ede50d718c4f0cc8707c7971194b79240c..fca747b2badeb4f810bcf4945186028a5ff78c96 100644 (file)
--- a/inc/modules/login.php
+++ b/inc/modules/login.php
@@ -39,9 +39,8 @@
 if (!defined('__SECURITY')) {
        die();
 } elseif (!isMember()) {
-       $url = 'modules.php?module=index';
-       if (checkModulePermissions('login') == 'mem_only') $url .= '&code=' . getCode('MODULE_MEMBER_ONLY') . '&mod=' . getModule();
-       redirectToUrl($url);
+       // Redirect to login form with displayed error code
+       redirectToUrl('modules.php?module=index&what=login&code=' . getCode('MODULE_MEMBER_ONLY') . '&mod=' . getModule());
 } // END - if
 
 // Disable block mode by default

diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php
index f891d0609fa8f7d36799e234691f702d188df50f..2dff54b5223c46005ce88ea543b42c6117d6915a 100644 (file)
--- a/inc/modules/member/what-order.php
+++ b/inc/modules/member/what-order.php
@@ -671,7 +671,7 @@ LIMIT 1",
        }
 } else {
        // Please confirm some mails first
-       loadTemplate('admin_settings_saved', false, getMaskedMessage('MEMBER_LINKS_LEFT'), $links);
+       loadTemplate('admin_settings_saved', false, '<span class="notice">{%message,MEMBER_LINKS_LEFT=' . $links . '%}</span>', $links);
 }
 
 if (!empty($url)) {