Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix html <title> for exceptions during message parsing.

Browse source 
Previously an ugly {{SITENAME}} would show up for exceptions
that happened in the middle of processing a message

Change-Id: I4e3b675673dc3b74f89e4325f6a0a8b44162f478
This commit is contained in:
Brian Wolff 2017-10-18 06:27:12 +00:00
parent 64462df23b
commit bbcbcaba3d
2 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
includes/exception/MWException.php
View file

@ -73,15 +73,23 @@ class MWException extends Exception {
* @return string Message with arguments replaced
*/
public function msg( $key, $fallback /*[, params...] */ ) {
global $wgSitename;
$args = array_slice( func_get_args(), 2 );
$res = false;
if ( $this->useMessageCache() ) {
try {
return wfMessage( $key, $args )->text();
$res = wfMessage( $key, $args )->text();
} catch ( Exception $e ) {
}
}
return wfMsgReplaceArgs( $fallback, $args );
if ( $res === false ) {
$res = wfMsgReplaceArgs( $fallback, $args );
// If an exception happens inside message rendering,
// {{SITENAME}} sometimes won't be replaced.
$res = preg_replace( '/\{\{SITENAME\}\}/', $wgSitename, $res );
}
return $res;
}
/**
@ -154,6 +162,16 @@ class MWException extends Exception {
global $wgOut, $wgSitename;
if ( $this->useOutputPage() ) {
$wgOut->prepareErrorPage( $this->getPageTitle() );
// Manually set the html title, since sometimes
// {{SITENAME}} does not get replaced for exceptions
// happening inside message rendering.
$wgOut->setHTMLTitle(
$this->msg(
'pagetitle',
"$1 - $wgSitename",
$this->getPageTitle()
)
);
$wgOut->addHTML( $this->getHTML() );

9
includes/exception/MWExceptionRenderer.php
View file

@ -197,12 +197,17 @@ class MWExceptionRenderer {
* @return string Message with arguments replaced
*/
private static function msg( $key, $fallback /*[, params...] */ ) {
global $wgSitename;
$args = array_slice( func_get_args(), 2 );
try {
return wfMessage( $key, $args )->text();
$res = wfMessage( $key, $args )->text();
} catch ( Exception $e ) {
return wfMsgReplaceArgs( $fallback, $args );
$res = wfMsgReplaceArgs( $fallback, $args );
// If an exception happens inside message rendering,
// {{SITENAME}} sometimes won't be replaced.
$res = preg_replace( '/\{\{SITENAME\}\}/', $wgSitename, $res );
}
return $res;
}
/**