From dca6824e4f8973d32156829514871145d73bed39 Mon Sep 17 00:00:00 2001 From: Jason Oster Date: Tue, 12 Jan 2010 19:33:41 +0000 Subject: Fix repeating ampersands at the end of the URL on log in/log out. Fix use of --- functions/userauth_functions.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/functions/userauth_functions.php b/functions/userauth_functions.php index b9204bc..b8abacb 100644 --- a/functions/userauth_functions.php +++ b/functions/userauth_functions.php @@ -7,7 +7,7 @@ function login_querys() { $querys = preg_replace('/(username|password|action)=[^&]+/', '', $_SERVER['QUERY_STRING']); // Return the login query string. - $querys = preg_replace('/&&/', '', $querys); + $querys = preg_replace('/&&|&$/', '', $querys); return $querys; } @@ -17,13 +17,13 @@ function login_querys() { function logout_querys() { // Make sure the action is logout. $querys = preg_replace('/action=[^&]+/', 'action=logout', $_SERVER['QUERY_STRING']); - if ($querys == $QUERY_STRING) $querys .= '&action=logout'; + if ($querys == $_SERVER['QUERY_STRING']) $querys .= '&action=logout'; // Remove references to the username or password. $querys = preg_replace('/(username|password)=[^&]+/', '', $querys); // Return the logout query string. - $querys = preg_replace('/&&/', '', $querys); + $querys = preg_replace('/&&|&$/', '', $querys); return $querys; } -- cgit v1.2.3