| Index: trunk/phase3/includes/Title.php |
| — | — | @@ -3108,7 +3108,7 @@ |
| 3109 | 3109 | $errors = array(); |
| 3110 | 3110 | |
| 3111 | 3111 | // wfFindFile( $nt ) / wfLocalFile( $nt ) is not allowed until below |
| 3112 | | - |
| | 3112 | + |
| 3113 | 3113 | $file = wfLocalFile( $this ); |
| 3114 | 3114 | if ( $file->exists() ) { |
| 3115 | 3115 | if ( $nt->getText() != wfStripIllegalFilenameChars( $nt->getText() ) ) { |
| — | — | @@ -3118,14 +3118,14 @@ |
| 3119 | 3119 | $errors[] = array( 'imagetypemismatch' ); |
| 3120 | 3120 | } |
| 3121 | 3121 | } |
| 3122 | | - |
| | 3122 | + |
| 3123 | 3123 | if ( $nt->getNamespace() != NS_FILE ) { |
| 3124 | 3124 | $errors[] = array( 'imagenocrossnamespace' ); |
| 3125 | | - // From here we want to do checks on a file object, so if we can't |
| | 3125 | + // From here we want to do checks on a file object, so if we can't |
| 3126 | 3126 | // create one, we must return. |
| 3127 | 3127 | return $errors; |
| 3128 | 3128 | } |
| 3129 | | - |
| | 3129 | + |
| 3130 | 3130 | // wfFindFile( $nt ) / wfLocalFile( $nt ) is allowed below here |
| 3131 | 3131 | |
| 3132 | 3132 | $destFile = wfLocalFile( $nt ); |
| — | — | @@ -3368,7 +3368,6 @@ |
| 3369 | 3369 | array( 'rc_timestamp' => $rcts, 'rc_namespace' => $newns, 'rc_title' => $newdbk, 'rc_new' => 1 ), |
| 3370 | 3370 | __METHOD__ |
| 3371 | 3371 | ); |
| 3372 | | - __METHOD__ ); |
| 3373 | 3372 | } |
| 3374 | 3373 | |
| 3375 | 3374 | # Save a null revision in the page's history notifying of the move |