updated to MediaWiki 1.14.0

1 files changed, 16 insertions, 5 deletions

diff --git a/maintenance/cleanupTitles.php b/maintenance/cleanupTitles.php
index a6991829..4d76ac7a 100644
--- a/maintenance/cleanupTitles.php
+++ b/maintenance/cleanupTitles.php
@@ -48,19 +48,30 @@ class TitleCleanup extends TableCleanup {
 
 		$title = Title::newFromText( $verified );
 
-		if( is_null( $title ) ) {
+		if( !is_null( $title ) && $title->equals( $current ) && $title->canExist() ) {
+			return $this->progress( 0 );  // all is fine
+		}
+
+		if( $row->page_namespace == NS_FILE && $this->fileExists( $row->page_title ) ) {
+			$this->log( "file $row->page_title needs cleanup, please run cleanupImages.php." );
+			return $this->progress( 0 );
+		} elseif( is_null( $title ) ) {
 			$this->log( "page $row->page_id ($display) is illegal." );
 			$this->moveIllegalPage( $row );
 			return $this->progress( 1 );
-		}
-
-		if( !$title->equals( $current ) ) {
+		} else {
 			$this->log( "page $row->page_id ($display) doesn't match self." );
 			$this->moveInconsistentPage( $row, $title );
 			return $this->progress( 1 );
 		}
+	}
 
-		$this->progress( 0 );
+	function fileExists( $name ) {
+		// XXX: Doesn't actually check for file existence, just presence of image record.
+		// This is reasonable, since cleanupImages.php only iterates over the image table.
+		$dbr = wfGetDB( DB_SLAVE );
+		$row = $dbr->selectRow( 'image', array( 'img_name' ), array( 'img_name' => $name ), __METHOD__ );
+		return $row !== false;
 	}
 
 	function moveIllegalPage( $row ) {