AutoAuthenticate hook for external User suppliers

diff --git a/docs/hooks.txt b/docs/hooks.txt
index 1197f43..8ebddc8 100644 (file)
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -285,6 +285,9 @@ $isminor: minor flag
 $iswatch: watch flag
 $section: section #
 
+'AutoAuthenticate': called to authenticate users on external/environmental means
+$user: writes user object to this parameter
+
 'BlockIp': before an IP address or user is blocked
 $block: the Block object about to be saved
 $user: the user _doing_ the block (not the one being blocked)

diff --git a/includes/Setup.php b/includes/Setup.php
index c8bb810..c566226 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -206,7 +206,11 @@ if( $wgCommandLineMode ) {
        # Prevent loading User settings from the DB.
        $wgUser->setLoaded( true );
 } else {
-       $wgUser = User::loadFromSession();
+       $wgUser = null;
+       wfRunHooks('AutoAuthenticate',array(&$wgUser));
+       if ($wgUser === null) {
+               $wgUser = User::loadFromSession();
+       }
 }
 
 wfProfileOut( $fname.'-User' );