aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2001-10-14 18:22:32 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2001-10-14 18:22:32 +0000
commit715a51c548f36ab2dca1fd61723f2f0b45e67a18 (patch)
treede089b57a0236d392c4dde081107a8a0d0dd6856 /phpBB/includes
parente4b9702ebc17ce0e3afb33afdd0e481d87e305ad (diff)
downloadforums-715a51c548f36ab2dca1fd61723f2f0b45e67a18.tar
forums-715a51c548f36ab2dca1fd61723f2f0b45e67a18.tar.gz
forums-715a51c548f36ab2dca1fd61723f2f0b45e67a18.tar.bz2
forums-715a51c548f36ab2dca1fd61723f2f0b45e67a18.tar.xz
forums-715a51c548f36ab2dca1fd61723f2f0b45e67a18.zip
Various changes to location redirection ... please note the format and name changes
git-svn-id: file:///svn/phpbb/trunk@1190 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/sessions.php5
1 files changed, 2 insertions, 3 deletions
diff --git a/phpBB/includes/sessions.php b/phpBB/includes/sessions.php
index 14fc58c224..6449ca0467 100644
--- a/phpBB/includes/sessions.php
+++ b/phpBB/includes/sessions.php
@@ -416,14 +416,13 @@ function session_end($session_id, $user_id)
// around every single URL and form action. If you replace the session
// code you must include this routine, even if it's empty.
//
-function append_sid($url)
+function append_sid($url, $non_html_amp = false)
{
global $SID;
if(!empty($SID) && !eregi("sid=", $url))
{
-// $url = ereg_replace("[&?]+$", "", $url);
- $url .= ( (strpos($url, "?") != false) ? "&amp;" : "?" ) . $SID;
+ $url .= ( (strpos($url, "?") != false) ? ( ( $non_html_amp ) ? "&" : "&amp;" ) : "?" ) . $SID;
}
return($url);