From c3e3cc1cd3c6901e4a8d6bbead67beedd63797e4 Mon Sep 17 00:00:00 2001 From: Sam Reed Date: Thu, 29 Sep 2011 22:11:51 +0000 Subject: [PATCH] Another reverse merge artefact from r98467 --- includes/Title.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/includes/Title.php b/includes/Title.php index 41488ad2db..b31b87eceb 100644 --- a/includes/Title.php +++ b/includes/Title.php @@ -3108,7 +3108,7 @@ class Title { $errors = array(); // wfFindFile( $nt ) / wfLocalFile( $nt ) is not allowed until below - + $file = wfLocalFile( $this ); if ( $file->exists() ) { if ( $nt->getText() != wfStripIllegalFilenameChars( $nt->getText() ) ) { @@ -3118,14 +3118,14 @@ class Title { $errors[] = array( 'imagetypemismatch' ); } } - + if ( $nt->getNamespace() != NS_FILE ) { $errors[] = array( 'imagenocrossnamespace' ); - // From here we want to do checks on a file object, so if we can't + // From here we want to do checks on a file object, so if we can't // create one, we must return. return $errors; } - + // wfFindFile( $nt ) / wfLocalFile( $nt ) is allowed below here $destFile = wfLocalFile( $nt ); @@ -3368,7 +3368,6 @@ class Title { array( 'rc_timestamp' => $rcts, 'rc_namespace' => $newns, 'rc_title' => $newdbk, 'rc_new' => 1 ), __METHOD__ ); - __METHOD__ ); } # Save a null revision in the page's history notifying of the move -- 2.20.1