* Introduce 'UserEffectiveGroups' hook; see docs/hooks.txt for more information

* Add User::getRegistration() accessor

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index ef4f213..80bf023 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -109,6 +109,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   classes: mw-code, mw-css, mw-js)
 * (bug 6711) Add $wgAddGroups and $wgRemoveGroups to allow finer control over
   usergroup assignment.
+* Introduce 'UserEffectiveGroups' hook; see docs/hooks.txt for more information
 
 == Bugfixes since 1.10 ==
 

diff --git a/docs/hooks.txt b/docs/hooks.txt
index 0886c0c..6f188e9 100644 (file)
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -637,6 +637,10 @@ $article: article object watched
 $user: user that watched
 $article: article object that was watched
 
+'UserEffectiveGroups': Called in User::getEffectiveGroups()
+$user: User to get groups for
+&$groups: Current effective groups
+
 'CategoryPageView': before viewing a categorypage in CategoryPage::view
 $catpage: CategoryPage instance
 

diff --git a/includes/User.php b/includes/User.php
index 259c83b..426090e 100644 (file)
--- a/includes/User.php
+++ b/includes/User.php
@@ -1637,6 +1637,8 @@ class User {
                                                $this->mEffectiveGroups[] = 'emailconfirmed';
                                        }
                                }
+                               # Hook for additional groups
+                               wfRunHooks( 'UserEffectiveGroups', array( &$this, &$this->mEffectiveGroups ) );
                        }
                }
                return $this->mEffectiveGroups;
@@ -2467,6 +2469,18 @@ class User {
                        $this->mEmailToken &&
                        $this->mEmailTokenExpires > wfTimestamp();
        }
+       
+       /**
+        * Get the timestamp of account creation, or false for
+        * non-existent/anonymous user accounts
+        *
+        * @return mixed
+        */
+       public function getRegistration() {
+               return $this->mId > 0
+                       ? $this->mRegistration
+                       : false;
+       }
 
        /**
         * @param array $groups list of groups