X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FuserOptions.inc;h=01cf3c3eb1c00710289f872750dd20fbfb120cf5;hb=3bcc039e7a61da99e4af1a8c9c6de600b84d7e1d;hp=c657c03f7bf7bfdc3564a062fade439cf3f910dc;hpb=61898ad28ed69c5b391eb43e0db9386279b9612c;p=lhc%2Fweb%2Fwiklou.git diff --git a/maintenance/userOptions.inc b/maintenance/userOptions.inc index c657c03f7b..01cf3c3eb1 100644 --- a/maintenance/userOptions.inc +++ b/maintenance/userOptions.inc @@ -47,7 +47,7 @@ class UserOptions { */ function __construct( $opts, $args ) { if ( !$this->checkOpts( $opts, $args ) ) { - UserOptions::showUsageAndExit(); + self::showUsageAndExit(); } else { $this->mReady = $this->initializeOpts( $opts, $args ); } @@ -82,7 +82,6 @@ class UserOptions { * @return bool */ private function initializeOpts( $opts, $args ) { - $this->mQuick = isset( $opts['nowarn'] ); $this->mQuiet = isset( $opts['quiet'] ); $this->mDry = isset( $opts['dry'] ); @@ -149,12 +148,10 @@ class UserOptions { ); foreach ( $result as $id ) { - $user = User::newFromId( $id->user_id ); // Get the options and update stats if ( $this->mAnOption ) { - if ( !array_key_exists( $this->mAnOption, $defaultOptions ) ) { print "Invalid user option. Use --list to see valid choices\n"; exit; @@ -203,14 +200,12 @@ class UserOptions { ); foreach ( $result as $id ) { - $user = User::newFromId( $id->user_id ); $curValue = $user->getOption( $this->mAnOption ); $username = $user->getName(); if ( $curValue == $this->mOldValue ) { - if ( !$this->mQuiet ) { print "Setting {$this->mAnOption} for $username from '{$this->mOldValue}' " . "to '{$this->mNewValue}'): "; @@ -279,7 +274,6 @@ USAGE; * @return bool */ public function warn() { - if ( $this->mQuick ) { return true; }