Update to MediaWiki 1.18.0

* also update ArchLinux skin to chagnes in MonoBook
* Use only css to hide our menu bar when printing

1 files changed, 9 insertions, 2 deletions

diff --git a/maintenance/changePassword.php b/maintenance/changePassword.php
index 568952b9..ef87dfbd 100644
--- a/maintenance/changePassword.php
+++ b/maintenance/changePassword.php
@@ -29,13 +29,20 @@ require_once( dirname( __FILE__ ) . '/Maintenance.php' );
 class ChangePassword extends Maintenance {
 	public function __construct() {
 		parent::__construct();
-		$this->addOption( "user", "The username to operate on", true, true );
+		$this->addOption( "user", "The username to operate on", false, true );
+		$this->addOption( "userid", "The user id to operate on", false, true );
 		$this->addOption( "password", "The password to use", true, true );
 		$this->mDescription = "Change a user's password";
 	}
 
 	public function execute() {
-		$user = User::newFromName( $this->getOption( 'user' ) );
+		if ( $this->hasOption( "user" ) ) {
+			$user = User::newFromName( $this->getOption( 'user' ) );
+		} elseif ( $this->hasOption( "userid" ) ) {
+			$user = User::newFromId( $this->getOption( 'userid' ) );
+		} else {
+			$this->error( "A \"user\" or \"userid\" must be set to change the password for" , true );
+		}
 		if ( !$user->getId() ) {
 			$this->error( "No such user: " . $this->getOption( 'user' ), true );
 		}