diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-04-06 13:14:15 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-04-06 13:14:15 +0000 |
| commit | 088c6e1c3eb8cc044c328dd0988da7a9862ef7d5 (patch) | |
| tree | 605e7bd76febd6aa28cdbe25019586df2504ee5e | |
| parent | 554224e9e1d6de404a98b0021ba439e17ffa8826 (diff) | |
| download | forums-088c6e1c3eb8cc044c328dd0988da7a9862ef7d5.tar forums-088c6e1c3eb8cc044c328dd0988da7a9862ef7d5.tar.gz forums-088c6e1c3eb8cc044c328dd0988da7a9862ef7d5.tar.bz2 forums-088c6e1c3eb8cc044c328dd0988da7a9862ef7d5.tar.xz forums-088c6e1c3eb8cc044c328dd0988da7a9862ef7d5.zip | |
ticket #9599 - Nils, please review!
git-svn-id: file:///svn/phpbb/trunk@7285 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/functions.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index d20002dd96..b7e809737b 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2616,7 +2616,11 @@ function make_clickable($text, $server_url = false) // relative urls for this board $magic_url_match[] = '#(^|[\n\t (])(' . preg_quote($server_url, '#') . ')/(' . get_preg_expression('relative_url_inline') . ')#ie'; - $magic_url_replace[] = "'\$1<!-- l --><a href=\"' . append_sid('\$2/' . preg_replace('/(&|\?)sid=[0-9a-f]{32}$/', '', preg_replace('/(&|\?)sid=[0-9a-f]{32}&/', '\\\\1', '\$3'))) . '\">' . ((strlen('\$3')) ? preg_replace('/(&|\?)sid=[0-9a-f]{32}$/', '', preg_replace('/(&|\?)sid=[0-9a-f]{32}&/', '\\\\1', '\$3')) : '\$2/') . '</a><!-- l -->'"; + +// $magic_url_replace[] = "'\$1<!-- l --><a href=\"' . append_sid('\$2/' . preg_replace('/(&|\?)sid=[0-9a-f]{32}$/', '', preg_replace('/(&|\?)sid=[0-9a-f]{32}&/', '\\\\1', '\$3'))) . '\">' . ((strlen('\$3')) ? preg_replace('/(&|\?)sid=[0-9a-f]{32}$/', '', preg_replace('/(&|\?)sid=[0-9a-f]{32}&/', '\\\\1', '\$3')) : '\$2/') . '</a><!-- l -->'"; + + // Instead of the above, we do not call append_sid to not let the sid and the _extra_url being appended... + $magic_url_replace[] = "'\$1<!-- l --><a href=\"$2/' . preg_replace('/(&|\?)sid=[0-9a-f]{32}$/', '', preg_replace('/(&|\?)sid=[0-9a-f]{32}&/', '\\\\1', '\$3')) . '\">' . ((strlen('\$3')) ? preg_replace('/(&|\?)sid=[0-9a-f]{32}$/', '', preg_replace('/(&|\?)sid=[0-9a-f]{32}&/', '\\\\1', '\$3')) : '\$2/') . '</a><!-- l -->'"; // matches a xxxx://aaaaa.bbb.cccc. ... $magic_url_match[] = '#(^|[\n\t (])(' . get_preg_expression('url_inline') . ')#ie'; |