diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-04-06 19:24:40 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-04-06 19:24:40 +0000 |
| commit | 2b883a7360bef75686bb057be25d1dfdf06388bb (patch) | |
| tree | 7ccb12021dc60dfc6ebfa33da6d4e31fa43e89df /phpBB/includes | |
| parent | 3f6b104312b703701272f5253e391b37c3fcef6b (diff) | |
| download | forums-2b883a7360bef75686bb057be25d1dfdf06388bb.tar forums-2b883a7360bef75686bb057be25d1dfdf06388bb.tar.gz forums-2b883a7360bef75686bb057be25d1dfdf06388bb.tar.bz2 forums-2b883a7360bef75686bb057be25d1dfdf06388bb.tar.xz forums-2b883a7360bef75686bb057be25d1dfdf06388bb.zip | |
revert this change. It is actually not a bug. We use append_sid on *view* to let relative links correctly work.
git-svn-id: file:///svn/phpbb/trunk@7289 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions.php | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index b7e809737b..d20002dd96 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2616,11 +2616,7 @@ 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 -->'"; - - // 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 -->'"; + $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 -->'"; // matches a xxxx://aaaaa.bbb.cccc. ... $magic_url_match[] = '#(^|[\n\t (])(' . get_preg_expression('url_inline') . ')#ie'; |