Fix problems with existing sessions

Signed-off-by: jdarwood007 <unmonitored+github@sleepycode.com>
SimpleMachines · Nov 4, 2013 · 2d168b4 · 2d168b4
1 parent dcb14c2
commit 2d168b4
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/Auth_SMF.php b/Auth_SMF.php
@@ -286,9 +286,12 @@ function AutoAuthenticateSMF ($initial_user_data, &$user)
 		$user->saveSettings();
 	}
 
-	// Go ahead and log 'em in
-	wfSetupSession();
-	$user->setCookies();
+	// Go ahead and log 'em in, but only if the session isn't already going.
+	if (session_id() === '')
+	{
+		wfSetupSession();
+		$user->setCookies();
+	}
 
 	return true;
 }