Hooks:UserCan: allow advisory external checks instead of overriding ones

This allows targeted rules to be imposed without mocking up with core code too much.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 36e2e5e..f8622a6 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -144,6 +144,7 @@ Images:
 * (bug 4426) Add link to user_talk page on image pages
 * Support a custom convert command for thumbnailing. See DefaultSettings.php
   and the comments for $wgCustomConvertCommand, for more information.
+* UserCan hook now allows advisory return values, rather than mandatory ones.
 
 Installer:
 * (bug 3782) Throw fatal installation warning if mbstring.func_overload on.

diff --git a/docs/hooks.txt b/docs/hooks.txt
index eb48c1e..50ace1e 100644 (file)
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -380,11 +380,12 @@ string $saveName: destination file name
 string $tempName: filesystem path to the temporary file for checks
 string &$error: output: HTML error to show if upload canceled by returning false
 
-'UserCan': To interrupt the "user can do X to Y article" check
+'UserCan': To interrupt/advise the "user can do X to Y article" check
 $title: Title object being checked against
 $user : Current user object
 $action: Action being checked
-$result: Pointer to result returned if hook returns false
+$result: Pointer to result returned if hook returns false. If null is returned,
+ UserCan checks are continued by internal code
 
 'UserCreateForm': change to manipulate the login form
 $template: SimpleTemplate instance for the form

diff --git a/includes/Title.php b/includes/Title.php
index 9001c35..0408f51 100644 (file)
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -969,7 +969,9 @@ class Title {
                $result = true;
                if ( !wfRunHooks( 'userCan', array( &$this, &$wgUser, $action, &$result ) ) ) {
                        wfProfileOut( $fname );
-                       return $result;
+                       // Allow advisory rights checking
+                       if ( $result !== null )
+                               return $result;
                }
 
                if( NS_SPECIAL == $this->mNamespace ) {