From 816bc5da616f1326d97fa20ccf59f3b1bca9fe1d Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Mon, 30 Apr 2007 13:32:18 +0000
Subject: "Ghost" topics in active topics list when shadow topics and
 corresponding topic in same resultset [#10313] Find a member supporting
 hidden groups for those able to see them [#10305] Display hidden groups for
 all those able to see them across the board (composing messages, viewonline)
 Fix space for sending PM's to groups Let the permissions_phpbb file be
 included the same way as all other permission files [#10301] Add request_a-z+
 handling within modules_auth suggested by Pyramide. This will allow modders
 to directly show/hide their module in addition to !empty() $_REQUEST
 variables. [#10297]

git-svn-id: file:///svn/phpbb/trunk@7433 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/functions_module.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes/functions_module.php')

diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php
index 86cc93435d..bbb44d4b3d 100644
--- a/phpBB/includes/functions_module.php
+++ b/phpBB/includes/functions_module.php
@@ -298,7 +298,7 @@ class p_master
 				break;
 
 				default:
-					if (!preg_match('#(?:acl_([a-z_]+)(,\$id)?)|(?:\$id)|(?:aclf_([a-z_]+))|(?:cfg_([a-z_]+))#', $token))
+					if (!preg_match('#(?:acl_([a-z_]+)(,\$id)?)|(?:\$id)|(?:aclf_([a-z_]+))|(?:cfg_([a-z_]+))|(?:request_([a-z_]+))#', $token))
 					{
 						$token = '';
 					}
@@ -314,7 +314,7 @@ class p_master
 		$forum_id = ($forum_id === false) ? $this->acl_forum_id : $forum_id;
 
 		$is_auth = false;
-		eval('$is_auth = (int) (' . preg_replace(array('#acl_([a-z_]+)(,\$id)?#', '#\$id#', '#aclf_([a-z_]+)#', '#cfg_([a-z_]+)#'), array('(int) $auth->acl_get(\'\\1\'\\2)', '(int) $forum_id', '(int) $auth->acl_getf_global(\'\\1\')', '(int) $config[\'\\1\']'), $module_auth) . ');');
+		eval('$is_auth = (int) (' . preg_replace(array('#acl_([a-z_]+)(,\$id)?#', '#\$id#', '#aclf_([a-z_]+)#', '#cfg_([a-z_]+)#', '#request_([a-z_]+)#'), array('(int) $auth->acl_get(\'\\1\'\\2)', '(int) $forum_id', '(int) $auth->acl_getf_global(\'\\1\')', '(int) $config[\'\\1\']', '!empty($_REQUEST[\'\\1\'])'), $module_auth) . ');');
 
 		return $is_auth;
 	}
-- 
cgit v1.2.1