Changeset 5115 in subversion

Timestamp:

Aug 23, 2011 2:15:04 PM (21 months ago)

Author:

alec

Message:

• Backported r5093

File:

• branches/release-0.6/plugins/http_authentication/http_authentication.php (modified) (2 diffs)

branches/release-0.6/plugins/http_authentication/http_authentication.php

@@ -6 +6 @@
  * Make use of an existing HTTP authentication and perform login with the existing user credentials
  *
- * @version 1.2
+ * @version 1.3
  * @author Thomas Bruederli
  */
@@ -31 +31 @@
   function authenticate($args)
   {
+    // Allow entering other user data in login form,
+    // e.g. after log out (#1487953)
+    if (!empty($args['user'])) {
+        return $args;
+    }
+
     if (!empty($_SERVER['PHP_AUTH_USER']) && !empty($_SERVER['PHP_AUTH_PW'])) {
       $args['user'] = $_SERVER['PHP_AUTH_USER'];
       $args['pass'] = $_SERVER['PHP_AUTH_PW'];
     }
-    
+
     $args['cookiecheck'] = false;
     $args['valid'] = true;
-  
+
     return $args;
   }