diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-09-30 15:18:35 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-09-30 15:18:35 +0000 |
| commit | ad4d7c036eb144559bbce553afa4952587c28e56 (patch) | |
| tree | 4a24c7861d50bc475f27220b3eb317bf09e836dd /phpBB/includes/functions_content.php | |
| parent | e4c3a743cae78196ef0e2bfd0dcd27e1ea4bb1ba (diff) | |
| download | forums-ad4d7c036eb144559bbce553afa4952587c28e56.tar forums-ad4d7c036eb144559bbce553afa4952587c28e56.tar.gz forums-ad4d7c036eb144559bbce553afa4952587c28e56.tar.bz2 forums-ad4d7c036eb144559bbce553afa4952587c28e56.tar.xz forums-ad4d7c036eb144559bbce553afa4952587c28e56.zip | |
merge r8956, r8957 and r8960
git-svn-id: file:///svn/phpbb/trunk@8961 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_content.php')
| -rw-r--r-- | phpBB/includes/functions_content.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index 95364b4f71..d9c07182a5 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -238,7 +238,7 @@ function bump_topic_allowed($forum_id, $topic_bumped, $last_post_time, $topic_po function get_context($text, $words, $length = 400) { // first replace all whitespaces with single spaces - $text = preg_replace('/ +/', ' ', strtr($text, "\t\n\r\x0C ", ' '), $text); + $text = preg_replace('/ +/', ' ', strtr($text, "\t\n\r\x0C ", ' ')); $word_indizes = array(); if (sizeof($words)) |