Merge "Warn if stateful ParserOutput transforms are used"

[lhc/web/wiklou.git] / includes / user / UserGroupMembership.php

diff --git a/includes/user/UserGroupMembership.php b/includes/user/UserGroupMembership.php
index cf05df3..f771f42 100644 (file)
--- a/includes/user/UserGroupMembership.php
+++ b/includes/user/UserGroupMembership.php
@@ -276,7 +276,7 @@ class UserGroupMembership {
         *
         * @param int $userId ID of the user to search for
         * @param IDatabase|null $db Optional database connection
-        * @return array Associative array of (group name => UserGroupMembership object)
+        * @return UserGroupMembership[] Associative array of (group name => UserGroupMembership object)
         */
        public static function getMembershipsForUser( $userId, IDatabase $db = null ) {
                if ( !$db ) {
@@ -344,8 +344,8 @@ class UserGroupMembership {
         * @return string
         */
        public static function getLink( $ugm, IContextSource $context, $format,
-               $userName = null ) {
-
+               $userName = null
+       ) {
                if ( $format !== 'wiki' && $format !== 'html' ) {
                        throw new MWException( 'UserGroupMembership::getLink() $format parameter should be ' .
                                "'wiki' or 'html'" );