From 816bc5da616f1326d97fa20ccf59f3b1bca9fe1d Mon Sep 17 00:00:00 2001 From: Meik Sievertsen 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_admin.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'phpBB/includes/functions_admin.php') diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index a96e6f7240..5a45b9f9dc 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -2916,12 +2916,9 @@ function add_permission_language() { global $user, $phpEx; - // First of all, our own file. - $user->add_lang('acp/permissions_phpbb'); - $files_to_add = array(); - // Now search in acp and mods folder for permissions_ files. + // Search in acp and mods folder for permissions_ files. foreach (array('acp/', 'mods/') as $path) { $dh = @opendir($user->lang_path . $path); @@ -2930,7 +2927,7 @@ function add_permission_language() { while (($file = readdir($dh)) !== false) { - if (strpos($file, 'permissions_') === 0 && strpos($file, 'permissions_phpbb') === false && substr($file, -(strlen($phpEx) + 1)) === '.' . $phpEx) + if (strpos($file, 'permissions_') === 0 && substr($file, -(strlen($phpEx) + 1)) === '.' . $phpEx) { $files_to_add[] = $path . substr($file, 0, -(strlen($phpEx) + 1)); } -- cgit v1.2.1