diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2005-01-05 06:35:44 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2005-01-05 06:35:44 +0000 |
| commit | ccde3b3e41c902c162c2bc4b6e66eb92bdfa270d (patch) | |
| tree | f664408f7d7fac735e38e303ee595cab338dde6c /phpBB/includes | |
| parent | d6fa1319e56b7c9d13e91e136d46f60fada9dabe (diff) | |
| download | forums-ccde3b3e41c902c162c2bc4b6e66eb92bdfa270d.tar forums-ccde3b3e41c902c162c2bc4b6e66eb92bdfa270d.tar.gz forums-ccde3b3e41c902c162c2bc4b6e66eb92bdfa270d.tar.bz2 forums-ccde3b3e41c902c162c2bc4b6e66eb92bdfa270d.tar.xz forums-ccde3b3e41c902c162c2bc4b6e66eb92bdfa270d.zip | |
- split long urls fix (& into &)
git-svn-id: file:///svn/phpbb/trunk@5046 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/message_parser.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index 7caadd123e..aaa6c18268 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -825,11 +825,11 @@ class parse_message extends bbcode_firstpass // matches a xxxx://aaaaa.bbb.cccc. ... $match[] = '#(^|[\n ]|\()([\w]+?://.*?([^ \t\n\r<"\'\)]*)?)#ie'; - $replace[] = "'\$1<!-- m --><a href=\"\$2\" target=\"_blank\">' . ((strlen('\$2') > 55) ? substr('\$2', 0, 39) . ' ... ' . substr('\$2', -10) : '\$2') . '</a><!-- m -->'"; + $replace[] = "'\$1<!-- m --><a href=\"\$2\" target=\"_blank\">' . ((strlen('\$2') > 55) ? substr(str_replace('&', '&', '\$2'), 0, 39) . ' ... ' . substr(str_replace('&', '&', '\$2'), -10) : '\$2') . '</a><!-- m -->'"; // matches a "www.xxxx.yyyy[/zzzz]" kinda lazy URL thing $match[] = '#(^|[\n ]|\()(www\.[\w\-]+\.[\w\-.\~]+(?:/[^ \t\n\r<"\'\)]*)?)#ie'; - $replace[] = "'\$1<!-- w --><a href=\"http://\$2\" target=\"_blank\">' . ((strlen('\$2') > 55) ? substr(str_replace(' ', '%20', '\$2'), 0, 39) . ' ... ' . substr('\$2', -10) : '\$2') . '</a><!-- w -->'"; + $replace[] = "'\$1<!-- w --><a href=\"http://\$2\" target=\"_blank\">' . ((strlen('\$2') > 55) ? substr(str_replace('&', '&', '\$2'), 0, 39) . ' ... ' . substr(str_replace('&', '&', '\$2'), -10) : '\$2') . '</a><!-- w -->'"; // matches an email@domain type address at the start of a line, or after a space. $match[] = '#(^|[\n ]|\()([a-z0-9&\-_.]+?@[\w\-]+\.([\w\-\.]+\.)?[\w]+)#ie'; |