* Tweak for my last commit: parse -> parseinline

* Add bug no in RELEASE-NOTES

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 94c0536..229c067 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -42,7 +42,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   sidebar and add custom portlets to it
 * Added 'MakeGlobalVariablesScript' hook for extensions to be able to add vari-
   ables into into the output of Skin::makeVariablesScript
-* Added $wgAddGroups and $wgRemoveGroups display on Special:ListGroupRights
+* (bug 13846) Added $wgAddGroups and $wgRemoveGroups display on
+  Special:ListGroupRights
 * (bug 14377) Add a date selector to history pages
 * (bug 15007) New 'pagetitle-view-mainpage' message allows the HTML <title> of
   the main page to be customized

diff --git a/includes/specials/SpecialListgrouprights.php b/includes/specials/SpecialListgrouprights.php
index 4762ae4..5c76df8 100644 (file)
--- a/includes/specials/SpecialListgrouprights.php
+++ b/includes/specials/SpecialListgrouprights.php
@@ -100,7 +100,7 @@ class SpecialListGroupRights extends SpecialPage {
                $r = array();
                foreach( $permissions as $permission => $granted ) {
                        if ( $granted ) {
-                               $description = wfMsgExt( 'listgrouprights-right-display', array( 'parse' ),
+                               $description = wfMsgExt( 'listgrouprights-right-display', array( 'parseinline' ),
                                        User::getRightDescription( $permission ),
                                        $permission
                                );
@@ -111,12 +111,12 @@ class SpecialListGroupRights extends SpecialPage {
                if( $add === true ){
                        $r[] = wfMsgExt( 'listgrouprights-addgroup-all', array( 'escape' ) );
                } else if( is_array( $add ) && count( $add ) ) {
-                       $r[] = wfMsgExt( 'listgrouprights-addgroup', array( 'parse' ), $wgLang->listToText( array_map( array( 'User', 'makeGroupLinkWiki' ), $add ) ), count( $add ) );
+                       $r[] = wfMsgExt( 'listgrouprights-addgroup', array( 'parseinline' ), $wgLang->listToText( array_map( array( 'User', 'makeGroupLinkWiki' ), $add ) ), count( $add ) );
                }
                if( $remove === true ){
                        $r[] = wfMsgExt( 'listgrouprights-removegroup-all', array( 'escape' ) );
                } else if( is_array( $remove ) && count( $remove ) ) {
-                       $r[] = wfMsgExt( 'listgrouprights-removegroup', array( 'parse' ), $wgLang->listToText( array_map( array( 'User', 'makeGroupLinkWiki' ), $remove ) ), count( $remove ) );
+                       $r[] = wfMsgExt( 'listgrouprights-removegroup', array( 'parseinline' ), $wgLang->listToText( array_map( array( 'User', 'makeGroupLinkWiki' ), $remove ) ), count( $remove ) );
                }
                if( empty( $r ) ) {
                        return '';