From 0cd966d46933349876e3d543fd3f6ed34aa66270 Mon Sep 17 00:00:00 2001 From: Chad Horohoe Date: Tue, 6 Sep 2016 13:14:35 -0700 Subject: [PATCH] SpecialUpload: Give a context title to getExistsWarning() messages Parsed messages should always have a context title to parse in Change-Id: I69ceaf7d0fe7e8f5f868b9119aea1fd3a0e73400 --- includes/specials/SpecialUpload.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php index 305c0e9fff..4583305adc 100644 --- a/includes/specials/SpecialUpload.php +++ b/includes/specials/SpecialUpload.php @@ -775,31 +775,31 @@ class SpecialUpload extends SpecialPage { $file = $exists['file']; $filename = $file->getTitle()->getPrefixedText(); - $warning = ''; + $warnMsg = null; if ( $exists['warning'] == 'exists' ) { // Exact match - $warning = wfMessage( 'fileexists', $filename )->parse(); + $warnMsg = wfMessage( 'fileexists', $filename ); } elseif ( $exists['warning'] == 'page-exists' ) { // Page exists but file does not - $warning = wfMessage( 'filepageexists', $filename )->parse(); + $warnMsg = wfMessage( 'filepageexists', $filename ); } elseif ( $exists['warning'] == 'exists-normalized' ) { - $warning = wfMessage( 'fileexists-extension', $filename, - $exists['normalizedFile']->getTitle()->getPrefixedText() )->parse(); + $warnMsg = wfMessage( 'fileexists-extension', $filename, + $exists['normalizedFile']->getTitle()->getPrefixedText() ); } elseif ( $exists['warning'] == 'thumb' ) { // Swapped argument order compared with other messages for backwards compatibility - $warning = wfMessage( 'fileexists-thumbnail-yes', - $exists['thumbFile']->getTitle()->getPrefixedText(), $filename )->parse(); + $warnMsg = wfMessage( 'fileexists-thumbnail-yes', + $exists['thumbFile']->getTitle()->getPrefixedText(), $filename ); } elseif ( $exists['warning'] == 'thumb-name' ) { // Image w/o '180px-' does not exists, but we do not like these filenames $name = $file->getName(); $badPart = substr( $name, 0, strpos( $name, '-' ) + 1 ); - $warning = wfMessage( 'file-thumbnail-no', $badPart )->parse(); + $warnMsg = wfMessage( 'file-thumbnail-no', $badPart ); } elseif ( $exists['warning'] == 'bad-prefix' ) { - $warning = wfMessage( 'filename-bad-prefix', $exists['prefix'] )->parse(); + $warnMsg = wfMessage( 'filename-bad-prefix', $exists['prefix'] ); } - return $warning; + return $warnMsg ? $warnMsg->title( $file->getTitle() )->parse() : ''; } /** -- 2.20.1