Index: trunk/phase3/includes/upload/UploadBase.php |
— | — | @@ -417,9 +417,7 @@ |
418 | 418 | * filter out illegal characters, and try to make a legible name |
419 | 419 | * out of it. We'll strip some silently that Title would die on. |
420 | 420 | */ |
421 | | - $basename = $this->mDesiredDestName; |
422 | | - |
423 | | - $this->mFilteredName = wfStripIllegalFilenameChars( $basename ); |
| 421 | + $this->mFilteredName = wfStripIllegalFilenameChars( $this->mDesiredDestName ); |
424 | 422 | /* Normalize to title form before we do any further processing */ |
425 | 423 | $nt = Title::makeTitleSafe( NS_FILE, $this->mFilteredName ); |
426 | 424 | if( is_null( $nt ) ) { |
— | — | @@ -466,11 +464,6 @@ |
467 | 465 | return $this->mTitle = null; |
468 | 466 | } |
469 | 467 | |
470 | | - $nt = Title::makeTitleSafe( NS_FILE, $this->mFilteredName ); |
471 | | - if( is_null( $nt ) ) { |
472 | | - $this->mTitleError = self::ILLEGAL_FILENAME; |
473 | | - return $this->mTitle = null; |
474 | | - } |
475 | 468 | return $this->mTitle = $nt; |
476 | 469 | } |
477 | 470 | |