update to MediaWiki 1.17.0

1 files changed, 10 insertions, 9 deletions

diff --git a/maintenance/protect.php b/maintenance/protect.php
index 126707a7..baef45fb 100644
--- a/maintenance/protect.php
+++ b/maintenance/protect.php
@@ -18,7 +18,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname(__FILE__) . '/Maintenance.php' );
+require_once( dirname( __FILE__ ) . '/Maintenance.php' );
 
 class Protect extends Maintenance {
 	public function __construct() {
@@ -28,34 +28,35 @@ class Protect extends Maintenance {
 		$this->addOption( 'semiprotect', 'Adds semi-protection' );
 		$this->addOption( 'u', 'Username to protect with', false, true );
 		$this->addOption( 'r', 'Reason for un/protection', false, true );
+		$this->addArg( 'title', 'Title to protect', true );
 	}
 
 	public function execute() {
-		global $wgUser, $wgTitle, $wgArticle;
+		global $wgUser;
 
 		$userName = $this->getOption( 'u', 'Maintenance script' );
 		$reason = $this->getOption( 'r', '' );
 
 		$protection = "sysop";
-		if ( $this->hasOption('semiprotect') ) {
+		if ( $this->hasOption( 'semiprotect' ) ) {
 			$protection = "autoconfirmed";
-		} elseif ( $this->hasOption('unprotect') ) {
+		} elseif ( $this->hasOption( 'unprotect' ) ) {
 			$protection = "";
 		}
 
 		$wgUser = User::newFromName( $userName );
 		$restrictions = array( 'edit' => $protection, 'move' => $protection );
 
-		$wgTitle = Title::newFromText( $this->getArg() );
-		if ( !$wgTitle ) {
+		$t = Title::newFromText( $this->getArg() );
+		if ( !$t ) {
 			$this->error( "Invalid title", true );
 		}
 
-		$wgArticle = new Article( $wgTitle );
+		$article = new Article( $t );
 
 		# un/protect the article
 		$this->output( "Updating protection status... " );
-		$success = $wgArticle->updateRestrictions($restrictions, $reason);
+		$success = $article->updateRestrictions( $restrictions, $reason );
 		if ( $success ) {
 			$this->output( "done\n" );
 		} else {
@@ -65,4 +66,4 @@ class Protect extends Maintenance {
 }
 
 $maintClass = "Protect";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );