* Fix regression in 37317, random content going into logs

diff --git a/includes/specials/SpecialUserrights.php b/includes/specials/SpecialUserrights.php
index 28c9ca2..7fa21bc 100644 (file)
--- a/includes/specials/SpecialUserrights.php
+++ b/includes/specials/SpecialUserrights.php
@@ -197,8 +197,8 @@ class UserrightsPage extends SpecialPage {
                        $user->getUserPage(),
                        $wgRequest->getText( 'user-reason' ),
                        array(
-                               $this->makeGroupNameList( $oldGroups ),
-                               $this->makeGroupNameList( $newGroups )
+                               $this->makeGroupNameListForLog( $oldGroups ),
+                               $this->makeGroupNameListForLog( $newGroups )
                        )
                );
        }
@@ -295,6 +295,14 @@ class UserrightsPage extends SpecialPage {
                }
        }
 
+       function makeGroupNameListForLog( $ids ) {
+               if( empty( $ids ) ) {
+                       return '';
+               } else {
+                       return $this->makeGroupNameList( $ids );
+               }
+       }
+
        /**
         * Output a form to allow searching for a user
         */