From: Sam Reed <reedy@users.mediawiki.org>
Date: Thu, 29 Sep 2011 22:11:51 +0000 (+0000)
Subject: Another reverse merge artefact from r98467
X-Git-Tag: 1.31.0-rc.0~27354
X-Git-Url: https://git.cyclocoop.org/%7B%7B%20url_for%28%27static%27%2C%20filename=%27css/bootstrap.css%27%29%20%7D%7D?a=commitdiff_plain;h=c3e3cc1cd3c6901e4a8d6bbead67beedd63797e4;p=lhc%2Fweb%2Fwiklou.git

Another reverse merge artefact from r98467
---

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