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, 73 insertions, 5 deletions

diff --git a/maintenance/purgeList.php b/maintenance/purgeList.php
index 2c0308c0..85a7aae2 100644
--- a/maintenance/purgeList.php
+++ b/maintenance/purgeList.php
@@ -26,10 +26,22 @@ class PurgeList extends Maintenance {
 	public function __construct() {
 		parent::__construct();
 		$this->mDescription = "Send purge requests for listed pages to squid";
-		$this->addOption( 'purge', 'Whether to update page touched.' , false, false );
+		$this->addOption( 'purge', 'Whether to update page_touched.' , false, false );
+		$this->addOption( 'namespace', 'Namespace number', false, true );
+		$this->setBatchSize( 100 );
 	}
 
 	public function execute() {
+		if( $this->hasOption( 'namespace' ) ) {
+			$this->purgeNamespace();
+		} else {
+			$this->purgeList();
+		}
+		$this->output( "Done!\n" );
+	}
+
+	/** Purge URL coming from stdin */
+	private function purgeList() {
 		$stdin = $this->getStdin();
 		$urls = array();
 
@@ -40,7 +52,7 @@ class PurgeList extends Maintenance {
 			} elseif ( $page !== '' ) {
 				$title = Title::newFromText( $page );
 				if ( $title ) {
-					$url = $title->getFullUrl();
+					$url = $title->getInternalUrl();
 					$this->output( "$url\n" );
 					$urls[] = $url;
 					if ( $this->getOption( 'purge' ) ) {
@@ -51,13 +63,69 @@ class PurgeList extends Maintenance {
 				}
 			}
 		}
+		$this->sendPurgeRequest( $urls );
+	}
+
+	/** Purge a namespace given by --namespace */
+	private function purgeNamespace() {
+		$dbr = wfGetDB( DB_SLAVE );
+		$ns = $dbr->addQuotes( $this->getOption( 'namespace') );
+
+		$result = $dbr->select(
+			array( 'page' ),
+			array( 'page_namespace', 'page_title' ),
+			array( "page_namespace = $ns" ),
+			__METHOD__,
+			array( 'ORDER BY' => 'page_id' )
+		);
+
+		$start   = 0;
+		$end = $dbr->numRows( $result );
+		$this->output( "Will purge $end pages from namespace $ns\n" );
+
+		# Do remaining chunk
+		$end += $this->mBatchSize - 1;
+		$blockStart = $start;
+		$blockEnd = $start + $this->mBatchSize - 1;
+
+		while( $blockEnd <= $end ) {
+			# Select pages we will purge:
+			$result = $dbr->select(
+				array( 'page' ),
+				array( 'page_namespace', 'page_title' ),
+				array( "page_namespace = $ns" ),
+				__METHOD__,
+				array( # conditions
+					'ORDER BY' => 'page_id',
+					'LIMIT'    => $this->mBatchSize,
+					'OFFSET'   => $blockStart,
+				)
+			);
+			# Initialize/reset URLs to be purged
+			$urls = array();
+			foreach( $result as $row ) {
+				$title = Title::makeTitle( $row->page_namespace, $row->page_title );
+				$url = $title->getInternalUrl();
+				$urls[] = $url;
+			}
+
+			$this->sendPurgeRequest( $urls );
+
+			$blockStart += $this->mBatchSize;
+			$blockEnd   += $this->mBatchSize;
+		}
+	}
 
-		$this->output( "Purging " . count( $urls ) . " urls...\n" );
+	/**
+	 * Helper to purge an array of $urls
+	 * @param $urls array List of URLS to purge from squids
+	 */
+	private function sendPurgeRequest( $urls ) {
+		$this->output( "Purging " . count( $urls ). " urls\n" );
 		$u = new SquidUpdate( $urls );
 		$u->doUpdate();
-
-		$this->output( "Done!\n" );
 	}
+
 }
 
 $maintClass = "PurgeList";