aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRahul R <rahulr92@gmail.com>2012-05-19 01:59:25 +0530
committerRahul R <rahulr92@gmail.com>2012-05-19 02:02:20 +0530
commite2d286d9f133ffb5128262fc88bfd86766f7b50f (patch)
tree41ca0257c8da59ac40d6ed3e6151a6f5c6c8d6b0
parentbab32bd56afefb97634f7c9ac336c7ac2fe3f7c1 (diff)
downloadforums-e2d286d9f133ffb5128262fc88bfd86766f7b50f.tar
forums-e2d286d9f133ffb5128262fc88bfd86766f7b50f.tar.gz
forums-e2d286d9f133ffb5128262fc88bfd86766f7b50f.tar.bz2
forums-e2d286d9f133ffb5128262fc88bfd86766f7b50f.tar.xz
forums-e2d286d9f133ffb5128262fc88bfd86766f7b50f.zip
[ticket/10650] Subject is cleared if no permissions exist
The subject line will be cleared before passing to the template in case the user doesn't have sufficient permissions. PHPBB3-10650
-rw-r--r--phpBB/includes/functions_display.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 950c1f0cd8..0c5b80c609 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -465,8 +465,8 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
'FORUM_FOLDER_IMG_ALT' => isset($user->lang[$folder_alt]) ? $user->lang[$folder_alt] : '',
'FORUM_IMAGE' => ($row['forum_image']) ? '<img src="' . $phpbb_root_path . $row['forum_image'] . '" alt="' . $user->lang[$folder_alt] . '" />' : '',
'FORUM_IMAGE_SRC' => ($row['forum_image']) ? $phpbb_root_path . $row['forum_image'] : '',
- 'LAST_POST_SUBJECT' => censor_text($last_post_subject),
- 'LAST_POST_SUBJECT_TRUNCATED' => $last_post_subject_truncated,
+ 'LAST_POST_SUBJECT' => (!$row['forum_password'] && $auth->acl_get('f_read', $row['forum_id'])) ? censor_text($last_post_subject) : "",
+ 'LAST_POST_SUBJECT_TRUNCATED' => (!$row['forum_password'] && $auth->acl_get('f_read', $row['forum_id'])) ? $last_post_subject_truncated : "",
'LAST_POST_TIME' => $last_post_time,
'LAST_POSTER' => get_username_string('username', $row['forum_last_poster_id'], $row['forum_last_poster_name'], $row['forum_last_poster_colour']),
'LAST_POSTER_COLOUR' => get_username_string('colour', $row['forum_last_poster_id'], $row['forum_last_poster_name'], $row['forum_last_poster_colour']),