There's no such thing as $this in static functions. Thanks, Nikerabbit.

diff --git a/docs/hooks.txt b/docs/hooks.txt
index 0212dd0..4866a30 100644 (file)
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -520,7 +520,6 @@ after noinclude/includeonly/onlyinclude and other processing.
 tance to return false if the domain name doesn't match your organization
 $addr: The e-mail address entered by the user
 &$result: Set this and return false to override the internal checks
-$user: User the address is being validated for
 
 'isValidPassword': Override the result of User::isValidPassword()
 $password: The password entered by the user

diff --git a/includes/User.php b/includes/User.php
index 5f41c8c..0d2865c 100644 (file)
--- a/includes/User.php
+++ b/includes/User.php
@@ -527,7 +527,7 @@ class User {
         */
        public static function isValidEmailAddr( $addr ) {
                $result = null;
-               if( !wfRunHooks( 'isValidEmailAddr', array( $addr, &$result, $this ) ) ) {
+               if( !wfRunHooks( 'isValidEmailAddr', array( $addr, &$result ) ) ) {
                        return $result;
                }