diff options
| author | Nils Adermann <naderman@naderman.de> | 2007-05-13 16:15:20 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2007-05-13 16:15:20 +0000 |
| commit | 4b876ffee5b714bcd7fbf8eb2df022f32251a9ff (patch) | |
| tree | 77a8557507f9fd919486683e2566db34a64fc2f2 /phpBB/includes/message_parser.php | |
| parent | b8daa787095eece45eeb3e1b6351efbed292bbd1 (diff) | |
| download | forums-4b876ffee5b714bcd7fbf8eb2df022f32251a9ff.tar forums-4b876ffee5b714bcd7fbf8eb2df022f32251a9ff.tar.gz forums-4b876ffee5b714bcd7fbf8eb2df022f32251a9ff.tar.bz2 forums-4b876ffee5b714bcd7fbf8eb2df022f32251a9ff.tar.xz forums-4b876ffee5b714bcd7fbf8eb2df022f32251a9ff.zip | |
- correctly transfer the search query across search result pages
- changed highlighting so foo* will match foo again [Bug #10031]
- restructured magic urls (functionality still mostly the same), added a check for entities in urls and punctuation at the end of magic urls [Bugs #10639, #10293]
- undid the workaround for urls in quotes, as it's fixed by the new magic url handling
- allow magic urls enclosed in BBCode [Bug #10319]
- added handling for IPv6 addresses to the IP checking without adding extra options [Bug #9538]
- correctly handle search in search results of search queries with brackets [Bug #10581]
- added information about requirements for auth_apache [Bug #10107]
git-svn-id: file:///svn/phpbb/trunk@7559 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/message_parser.php')
| -rw-r--r-- | phpBB/includes/message_parser.php | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index 52bba31da3..9b3dcad871 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -1066,23 +1066,8 @@ class parse_message extends bbcode_firstpass // Parse URL's if ($allow_magic_url) { - $replaced = false; - - // We have the bbcode uid here, let's at least try to circumvent a specific bug... - if ($allow_bbcode && strpos($this->message, '[/quote:' . $this->bbcode_uid . ']') !== false && strpos($this->message, '":' . $this->bbcode_uid . ']') !== false) - { - $this->message = str_replace('":' . $this->bbcode_uid . ']', '"&quot;:' . $this->bbcode_uid . ']', $this->message); - $replaced = true; - } - $this->magic_url(generate_board_url()); - // Revert our change above - if ($replaced) - { - $this->message = str_replace('"&quot;:' . $this->bbcode_uid . ']', '":' . $this->bbcode_uid . ']', $this->message); - } - if ($config['max_' . $mode . '_urls']) { $num_urls += preg_match_all('#\<!-- ([lmwe]) --\>.*?\<!-- \1 --\>#', $this->message, $matches); |