jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/393056 )
Change subject: Fix for lowercased file names
......................................................................
Fix for lowercased file names
Applies only to reupload or red-link upload:
Even if lowecased name is passed in wpDestFile, NSFR creates a Title
object from it, and that title has some namespace if file is in namespace
of NS_MAIN by default, but in no case NS_FILE. Because of that setting
fase to capitalizing links in NS_FILE ns doesnt matter, because file can
never be in NS_FILE.
Needs cherry-picking to REL1_27
Change-Id: I165d665a31c6c7ef21017d10b8655abd0fe6721e
ERM: #8057
---
M src/Hooks/UploadFormInitDescriptor.php
1 file changed, 12 insertions(+), 3 deletions(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/Hooks/UploadFormInitDescriptor.php
b/src/Hooks/UploadFormInitDescriptor.php
index 6761529..7a89949 100644
--- a/src/Hooks/UploadFormInitDescriptor.php
+++ b/src/Hooks/UploadFormInitDescriptor.php
@@ -64,9 +64,18 @@
$this->selectedNamespace = '';
//"wpDestFile" is set on query string. e.g after click on
redlink or on re-upload
if( !empty( $this->descriptor['DestFile']['default'] ) ) {
- $target = \Title::newFromText(
$this->descriptor['DestFile']['default'] );
- $this->descriptor['DestFile']['default'] =
$target->getText();
- $this->selectedNamespace = str_replace( ' ', '_',
$target->getNsText() );
+ $target = $this->descriptor['DestFile']['default'];
+ $target = str_replace( '_', ' ', $target );
+ $targetPieces = explode( ':', $target );
+
+ $nsText = '';
+ if( count( $targetPieces) > 1 ) {
+ $nsText = str_replace( ' ', '_',
$targetPieces[0] );
+ $target = $targetPieces[1];
+ }
+
+ $this->descriptor['DestFile']['default'] = $target;
+ $this->selectedNamespace = $nsText;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/393056
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I165d665a31c6c7ef21017d10b8655abd0fe6721e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/NSFileRepo
Gerrit-Branch: master
Gerrit-Owner: ItSpiderman <[email protected]>
Gerrit-Reviewer: Robert Vogel <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
