2 files changed, 3 insertions, 7 deletions

diff --git a/functions/userauth_functions.php b/functions/userauth_functions.php
index 9be7205..b9204bc 100644
--- a/functions/userauth_functions.php
+++ b/functions/userauth_functions.php
@@ -3,10 +3,8 @@
 //
 // Returns the login query string.
 function login_querys() {
-	global $QUERY_STRING;
-
 	// Remove the username, password, and action values.
-	$querys = preg_replace('/(username|password|action)=[^&]+/', '', $QUERY_STRING);
+	$querys = preg_replace('/(username|password|action)=[^&]+/', '', $_SERVER['QUERY_STRING']);
 
 	// Return the login query string.
 	$querys = preg_replace('/&&/', '', $querys);
@@ -17,10 +15,8 @@ function login_querys() {
 //
 // Returns the logout query string.
 function logout_querys() {
-	global $QUERY_STRING;
-
 	// Make sure the action is logout.
-	$querys = preg_replace('/action=[^&]+/', 'action=logout', $QUERY_STRING);
+	$querys = preg_replace('/action=[^&]+/', 'action=logout', $_SERVER['QUERY_STRING']);
 	if ($querys == $QUERY_STRING) $querys .= '&action=logout';
 
 	// Remove references to the username or password.
diff --git a/languages/french.inc.php b/languages/french.inc.php
index 113c8a4..5a6af56 100644
--- a/languages/french.inc.php
+++ b/languages/french.inc.php
@@ -177,7 +177,7 @@ $monthsofyearshort_lang		= array ('Jan','Fév','Mar','Avr','Mai','Juin','J
 
 // For time formatting, check out: http://www.php.net/manual/en/function.date.php
 $timeFormat = 'H:i';
-$timeFormat_small = 'g:i';
+$timeFormat_small = 'G:i';
 
 // For date formatting, see note below
 $dateFormat_day = '%A %e %B';