diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-05-18 17:04:34 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-05-18 17:04:34 +0000 |
| commit | eafe38ea7a8a0ed60fe34cfee62bd58eced03142 (patch) | |
| tree | dc56062b5fd8350e3f55345b140d7d53785bb265 /phpBB/includes/message_parser.php | |
| parent | 88e0ca18abee7da8f968bbced620ec958069385c (diff) | |
| download | forums-eafe38ea7a8a0ed60fe34cfee62bd58eced03142.tar forums-eafe38ea7a8a0ed60fe34cfee62bd58eced03142.tar.gz forums-eafe38ea7a8a0ed60fe34cfee62bd58eced03142.tar.bz2 forums-eafe38ea7a8a0ed60fe34cfee62bd58eced03142.tar.xz forums-eafe38ea7a8a0ed60fe34cfee62bd58eced03142.zip | |
ok... enough of this. Do not change [quote] layout at all. Smilies, urls, etc. won't parse now again directly after quotes - away with this. Actually we do not need to babysit users, but the feature was nice and fixed an inability which anoyed me in 2.0.x. Hey, you can't have everything - at least it is no longer error prone.
git-svn-id: file:///svn/phpbb/trunk@7634 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/message_parser.php')
| -rw-r--r-- | phpBB/includes/message_parser.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index 0969603999..211a7f22b0 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -83,7 +83,10 @@ class bbcode_firstpass extends bbcode */ function prepare_bbcodes() { - // Add newline at the end and in front of each quote block to prevent parsing errors (urls, smilies, etc.) + // Ok, seems like users instead want the no-parsing of urls, smilies, etc. after and before and within quote tags being tagged as "not a bug". + // Fine by me ;) Will ease our live... but do not come back and cry at us, we won't hear you. + + /* Add newline at the end and in front of each quote block to prevent parsing errors (urls, smilies, etc.) if (strpos($this->message, '[quote') !== false && strpos($this->message, '[/quote]') !== false) { $this->message = str_replace("\r\n", "\n", $this->message); @@ -91,6 +94,7 @@ class bbcode_firstpass extends bbcode // We strip newlines and spaces after and before quotes in quotes (trimming) and then add exactly one newline $this->message = preg_replace('#\[quote(=".*?")?\]\s*(.*?)\s*\[/quote\]#siu', '[quote\1]' . "\n" . '\2' ."\n[/quote]", $this->message); } + */ // Add other checks which needs to be placed before actually parsing anything (be it bbcodes, smilies, urls...) } |