diff options
| author | Rahul R <rahulr92@gmail.com> | 2012-04-10 08:22:52 +0530 |
|---|---|---|
| committer | Rahul R <rahulr92@gmail.com> | 2012-04-10 08:22:52 +0530 |
| commit | 1e4710b1949155543a729d36b5da89c9c965f6c0 (patch) | |
| tree | 81d596e554ca214b76f424772357741df45b61a2 /phpBB/includes/functions_display.php | |
| parent | 6661c92dd3ce4dc9b414bb39706298725057b7c0 (diff) | |
| download | forums-1e4710b1949155543a729d36b5da89c9c965f6c0.tar forums-1e4710b1949155543a729d36b5da89c9c965f6c0.tar.gz forums-1e4710b1949155543a729d36b5da89c9c965f6c0.tar.bz2 forums-1e4710b1949155543a729d36b5da89c9c965f6c0.tar.xz forums-1e4710b1949155543a729d36b5da89c9c965f6c0.zip | |
[ticket/10650] Moving censoring to before truncation
The censor_text function is now being applied to the
last_post_subject before being truncated.
PHPBB3-10650
Diffstat (limited to 'phpBB/includes/functions_display.php')
| -rw-r--r-- | phpBB/includes/functions_display.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index 138749d2db..950c1f0cd8 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -397,7 +397,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod if ($row['forum_last_post_id']) { $last_post_subject = $row['forum_last_post_subject']; - $last_post_subject_truncated = truncate_string($last_post_subject, 30, 255 ,false, $user->lang['ELLIPSIS']); + $last_post_subject_truncated = truncate_string(censor_text($last_post_subject), 30, 255, false, $user->lang['ELLIPSIS']); $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']; } @@ -466,7 +466,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod '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' => censor_text($last_post_subject_truncated), + 'LAST_POST_SUBJECT_TRUNCATED' => $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']), |