Merge "Upgrade wikimedia/remex-html to 2.0.1" into REL1_31

[lhc/web/wiklou.git] / maintenance / purgeExpiredUserrights.php

diff --git a/maintenance/purgeExpiredUserrights.php b/maintenance/purgeExpiredUserrights.php
index 7554d4d..ee40f5f 100644 (file)
--- a/maintenance/purgeExpiredUserrights.php
+++ b/maintenance/purgeExpiredUserrights.php
@@ -18,11 +18,16 @@
  * @copyright GPLv2 http://www.gnu.org/copyleft/gpl.html
  * @author Eddie Greiner-Petter <wikimedia.org at eddie-sh.de>
  * @ingroup Maintenance
- * @since 1.31
  */
 
 require_once __DIR__ . '/Maintenance.php';
 
+/*
+ * Maintenance script to move expired userrights to user_former_groups
+ *
+ * @since 1.31
+ */
+
 class PurgeExpiredUserrights extends Maintenance {
        public function __construct() {
                parent::__construct();
@@ -31,12 +36,14 @@ class PurgeExpiredUserrights extends Maintenance {
 
        public function execute() {
                $this->output( "Purging expired user rights...\n" );
-               UserGroupMembership::purgeExpired();
-               $this->output(
-                       "Purge requests submitted. (These requests are deferred and may not have immediate effect.)\n"
-               );
+               $res = UserGroupMembership::purgeExpired();
+               if ( $res === false ) {
+                       $this->output( "Purging failed.\n" );
+               } else {
+                       $this->output( "$res rows purged.\n" );
+               }
        }
 }
 
-$maintClass = "PurgeExpiredUserrights";
+$maintClass = PurgeExpiredUserrights::class;
 require_once RUN_MAINTENANCE_IF_MAIN;