From: Aaron Schulz <aschulz@wikimedia.org>
Date: Thu, 5 Nov 2015 04:19:17 +0000 (-0800)
Subject: Make FindOrphanedFiles handle bad file titles
X-Git-Tag: 1.31.0-rc.0~9031^2
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=c1a9303abab2dbafcdf952269fe599616c09b350;p=lhc%2Fweb%2Fwiklou.git

Make FindOrphanedFiles handle bad file titles

Change-Id: Idb926097b6159c9c442ee6f427f1da60c5c5d2eb
---

diff --git a/maintenance/findOrphanedFiles.php b/maintenance/findOrphanedFiles.php
index a1e274cdc4..41650bd0e6 100644
--- a/maintenance/findOrphanedFiles.php
+++ b/maintenance/findOrphanedFiles.php
@@ -136,7 +136,11 @@ class FindOrphanedFiles extends Maintenance {
 		foreach ( array_diff( $curNames, $curNamesFound ) as $name ) {
 			$file = $repo->newFile( $name );
 			// Print name and public URL to ease recovery
-			$this->output( $name . "\n" . $file->getCanonicalUrl() . "\n\n" );
+			if ( $file ) {
+				$this->output( $name . "\n" . $file->getCanonicalUrl() . "\n\n" );
+			} else {
+				$this->error( "Cannot get URL for bad file title '$name'" );
+			}
 		}
 
 		foreach ( array_diff( $oldNames, $oldNamesFound ) as $name ) {