diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-04-04 18:28:36 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-04-04 19:23:05 -0400 |
| commit | 98964a913cb22761553d04170aa4830e324f7488 (patch) | |
| tree | 5a7a841cdacae65ea59ab965dd9d718e9e62085e /phpBB/includes/functions_display.php | |
| parent | b1fb34a4d7e446768b9f66ba6dd359173cd2a5fb (diff) | |
| download | forums-98964a913cb22761553d04170aa4830e324f7488.tar forums-98964a913cb22761553d04170aa4830e324f7488.tar.gz forums-98964a913cb22761553d04170aa4830e324f7488.tar.bz2 forums-98964a913cb22761553d04170aa4830e324f7488.tar.xz forums-98964a913cb22761553d04170aa4830e324f7488.zip | |
[ticket/10650] Revert merge of 'rahulr92/ticket/10650' into develop
The pull request (#654) was merged a little too quickly.
In particular, display_last_subject per-forum option needs consensus.
This reverts commit b1fb34a4d7e446768b9f66ba6dd359173cd2a5fb, reversing
changes made to 7d6b289671c51694f17dd5f9849abf2534b55e59.
PHPBB3-10650
Diffstat (limited to 'phpBB/includes/functions_display.php')
| -rw-r--r-- | phpBB/includes/functions_display.php | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index 4e70a4911c..18db64cc68 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -397,11 +397,6 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod if ($row['forum_last_post_id']) { $last_post_subject = $row['forum_last_post_subject']; - if (utf8_strlen(htmlspecialchars_decode($last_post_subject)) > 30) - { - $last_post_subject = htmlspecialchars(utf8_substr(htmlspecialchars_decode($last_post_subject, 0, 30))); - $last_post_subject .= '...'; - } $last_post_time = $user->format_date($row['forum_last_post_time']); $last_post_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $row['forum_id_last_post'] . '&p=' . $row['forum_last_post_id']) . '#p' . $row['forum_last_post_id']; } @@ -456,7 +451,6 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod 'S_LOCKED_FORUM' => ($row['forum_status'] == ITEM_LOCKED) ? true : false, 'S_LIST_SUBFORUMS' => ($row['display_subforum_list']) ? true : false, 'S_SUBFORUMS' => (sizeof($subforums_list)) ? true : false, - 'S_DISPLAY_SUBJECT' => ($last_post_subject && $row['display_last_subject'] && !$row['forum_password'] && $auth->acl_get('f_read', $row['forum_id'])) ? true : false, 'S_FEED_ENABLED' => ($config['feed_forum'] && !phpbb_optionget(FORUM_OPTION_FEED_EXCLUDE, $row['forum_options']) && $row['forum_type'] == FORUM_POST) ? true : false, 'FORUM_ID' => $row['forum_id'], |