From 626d46112349bc87ad5f64b8c16d9954144bff07 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Wed, 3 Nov 2010 23:04:00 +0000
Subject: [PATCH] Fix/Rewrite for getMaskedMessage() error, thanks to
 meinnimbuzz

---
 inc/modules/login.php             | 5 ++---
 inc/modules/member/what-order.php | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/inc/modules/login.php b/inc/modules/login.php
index 4e91d9ede5..fca747b2ba 100644
--- 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 .= '&amp;code=' . getCode('MODULE_MEMBER_ONLY') . '&amp;mod=' . getModule();
-	redirectToUrl($url);
+	// Redirect to login form with displayed error code
+	redirectToUrl('modules.php?module=index&amp;what=login&amp;code=' . getCode('MODULE_MEMBER_ONLY') . '&amp;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 f891d0609f..2dff54b522 100644
--- 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)) {
-- 
2.39.5