Parsed messages should always have a context title to parse in
Change-Id: I69ceaf7d0fe7e8f5f868b9119aea1fd3a0e73400
$file = $exists['file'];
$filename = $file->getTitle()->getPrefixedText();
$file = $exists['file'];
$filename = $file->getTitle()->getPrefixedText();
if ( $exists['warning'] == 'exists' ) {
// Exact match
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
} 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' ) {
} 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
} 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 );
} 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' ) {
} elseif ( $exists['warning'] == 'bad-prefix' ) {
- $warning = wfMessage( 'filename-bad-prefix', $exists['prefix'] )->parse();
+ $warnMsg = wfMessage( 'filename-bad-prefix', $exists['prefix'] );
+ return $warnMsg ? $warnMsg->title( $file->getTitle() )->parse() : '';