(bug 12614) Prevent logging of null change on Userrights . . . for real this time.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 0ee5e9c..a41b3c2 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -301,7 +301,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 12489) Special:Userrights listed in restricted section again
 * (bug 12553) Fixed invalid XHTML in edit conflict screen
 * (bug 12505) Fixed section=0 with action=raw
-* Do not log user rights change that didn't change anything
+* (bug 12614) Do not log user rights change that didn't change anything
 * (bug 12584) Don't reset cl_timestamp when auto-updating sort key on move
 * (bug 12588) Fix selection in namespace selector on Special:Newpages
 * Use only default options when generating RSS and Atom syndication links.

diff --git a/includes/SpecialUserrights.php b/includes/SpecialUserrights.php
index 4b0a50a..5089978 100644 (file)
--- a/includes/SpecialUserrights.php
+++ b/includes/SpecialUserrights.php
@@ -136,7 +136,7 @@ class UserrightsPage extends SpecialPage {
                        wfRunHooks( 'UserRights', array( &$user, $addgroup, $removegroup ) );
                }
 
-               if( $addgroup or $removegroup ) {
+               if( $newGroups != $oldGroups ) {
                        $log = new LogPage( 'rights' );
 
                        global $wgRequest;