Merge "UserrightsPage::makeGroupNameListForLog() was removed"

diff --combined RELEASE-NOTES-1.27
index 915b93b,8a0ab11..e8924ef
--- 1/RELEASE-NOTES-1.27
--- 2/RELEASE-NOTES-1.27
+++ b/RELEASE-NOTES-1.27
@@@ -104,9 -104,6 +104,9 @@@ HHVM 3.1
  * $wgPreloadJavaScriptMwUtil was removed (deprecated in 1.26).
    Extensions, skins, gadgets and scripts that use the mediawiki.util module must
    express a dependency on it.
 +* $wgIncludeLegacyJavaScript, deprecated in MediaWiki 1.26, now defaults false.
 +  Extensions, skins, gadgets and scripts that need the mediawiki.legacy.wikibits
 +  module should express a dependency on it.
  
  === New features in 1.27 ===
  * $wgDataCenterUpdateStickTTL was also added. This decides how long a user
@@@ -175,12 -172,6 +175,12 @@@
    be a good idea, but will log out all current sessions.
  * $wgEventRelayerConfig was added, for managing PubSub event relay configuration,
    specifically for reliable CDN url purges.
 +* Requests have unique IDs, equal to the UNIQUE_ID environment variable (when
 +  MediaWiki is behind Apache+mod_unique_id or something similar) or a randomly-
 +  generated 24-character string. This request ID is used to annotate log records
 +  and error messages. It is available client-side via mw.config.get( 'wgRequestId' ).
 +  The request ID supplants exception IDs. Accordingly, MWExceptionHandler::getLogId()
 +  is deprecated.
  
  === External library changes in 1.27 ===
  
@@@ -259,6 -250,7 +259,7 @@@
  * OutputPage::getScript() was removed (deprecated since 1.24).
  * OutputPage::out() was removed (deprecated since 1.22).
  * OutputPage::setAllowedModules() was removed (deprecated since 1.24).
+ * UserrightsPage::makeGroupNameListForLog() was removed (deprecated since 1.21).
  
  === Languages updated in 1.27 ===
  

diff --combined includes/specials/SpecialUserrights.php
index 740f2f7,7901d37..1ccfc2f
--- 1/includes/specials/SpecialUserrights.php
--- 2/includes/specials/SpecialUserrights.php
+++ b/includes/specials/SpecialUserrights.php
@@@ -119,7 -119,7 +119,7 @@@ class UserrightsPage extends SpecialPag
                }
  
                $fetchedStatus = $this->fetchUser( $this->mTarget );
 -              if ( $fetchedStatus->isOk() ) {
 +              if ( $fetchedStatus->isOK() ) {
                        $this->mFetchedUser = $fetchedStatus->value;
                        if ( $this->mFetchedUser instanceof User ) {
                                // Set the 'relevant user' in the skin, so it displays links like Contributions,
@@@ -425,23 -425,6 +425,6 @@@
                }
        }
  
-       /**
-        * Make a list of group names to be stored as parameter for log entries
-        *
-        * @deprecated since 1.21; use LogFormatter instead.
-        * @param array $ids
-        * @return string
-        */
-       function makeGroupNameListForLog( $ids ) {
-               wfDeprecated( __METHOD__, '1.21' );
- 
-               if ( empty( $ids ) ) {
-                       return '';
-               } else {
-                       return $this->makeGroupNameList( $ids );
-               }
-       }
- 
        /**
         * Output a form to allow searching for a user
         */
@@@ -627,7 -610,7 +610,7 @@@
         * @return string
         */
        private static function buildGroupLink( $group ) {
 -              return User::makeGroupLinkHtml( $group, User::getGroupName( $group ) );
 +              return User::makeGroupLinkHTML( $group, User::getGroupName( $group ) );
        }
  
        /**
@@@ -637,7 -620,7 +620,7 @@@
         * @return string
         */
        private static function buildGroupMemberLink( $group ) {
 -              return User::makeGroupLinkHtml( $group, User::getGroupMember( $group ) );
 +              return User::makeGroupLinkHTML( $group, User::getGroupMember( $group ) );
        }
  
        /**