Document new hook UserLoadFromSession and add a note to RELEASE-NOTES that AutoAuthen...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index fa164f7..39027e6 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -111,6 +111,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Show image links on Special:Whatlinkshere
 * Use rel="start", "prev", "next" appropriately on Pager-based pages
 * Add support for SQLite
+* AutoAuthenticate hook renamed to UserLoadFromSession
 
 === Bug fixes in 1.13 ===
 

diff --git a/docs/hooks.txt b/docs/hooks.txt
index bf8b396..00eb28f 100644 (file)
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -408,9 +408,6 @@ $article: target article (object)
 Gives a chance for an extension to set it programattically to a variable class.
 &$auth: the $wgAuth object, probably a stub
 
-'AutoAuthenticate': called to authenticate users on external/environmental means
-$user: writes user object to this parameter
-
 'AutopromoteCondition': check autopromote condition for user.
 $type: condition type
 $args: arguments
@@ -1163,6 +1160,10 @@ $user: User object
 $user: User to get rights for
 &$rights: Current rights
 
+'UserLoadFromSession': called to authenticate users on external/environmental means
+$user: user object being loaded
+&$result: set this to a boolean value to abort the normal authentification process
+
 'UserLoginComplete': after a user has logged in
 $user: the user object that was created on login
 $inject_html: Any HTML to inject after the "logged in" message.