Merge "Fix \n handling for HTMLUsersMultiselectField"

[lhc/web/wiklou.git] / includes / specials / SpecialUserrights.php

diff --git a/includes/specials/SpecialUserrights.php b/includes/specials/SpecialUserrights.php
index 127b530..d0a0317 100644 (file)
--- a/includes/specials/SpecialUserrights.php
+++ b/includes/specials/SpecialUserrights.php
@@ -215,7 +215,7 @@ class UserrightsPage extends SpecialPage {
         * @return bool
         */
        public function canProcessExpiries() {
-               return !$this->getConfig()->get( 'DisableUserGroupExpiry' );
+               return true;
        }
 
        /**
@@ -344,7 +344,7 @@ class UserrightsPage extends SpecialPage {
                // UNLESS the user can only add this group (not remove it) and the expiry time
                // is being brought forward (T156784)
                $add = array_filter( $add,
-                       function( $group ) use ( $groups, $groupExpiries, $removable, $ugms ) {
+                       function ( $group ) use ( $groups, $groupExpiries, $removable, $ugms ) {
                                if ( isset( $groupExpiries[$group] ) &&
                                        !in_array( $group, $removable ) &&
                                        isset( $ugms[$group] ) &&
@@ -437,12 +437,12 @@ class UserrightsPage extends SpecialPage {
 
                // make sure $oldUGMs and $newUGMs are in the same order, and serialise
                // each UGM object to a simplified array
-               $oldUGMs = array_map( function( $group ) use ( $oldUGMs ) {
+               $oldUGMs = array_map( function ( $group ) use ( $oldUGMs ) {
                        return isset( $oldUGMs[$group] ) ?
                                self::serialiseUgmForLog( $oldUGMs[$group] ) :
                                null;
                }, $oldGroups );
-               $newUGMs = array_map( function( $group ) use ( $newUGMs ) {
+               $newUGMs = array_map( function ( $group ) use ( $newUGMs ) {
                        return isset( $newUGMs[$group] ) ?
                                self::serialiseUgmForLog( $newUGMs[$group] ) :
                                null;