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

* Support passing message arguments to OutputPage::showErrorPage()

Browse source 
* (bug 8818) Expose "wpDestFile" as parameter $1 to "uploaddisabledtext"
This commit is contained in:
Rob Church 2007-05-18 20:46:42 +00:00
parent 8b5fbb8f6e
commit 0c919598c6
3 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
RELEASE-NOTES
View file

@ -31,6 +31,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
more information
* (bug 9628) Show warnings about slave lag on Special:Contributions,
Special:Watchlist
* (bug 8818) Expose "wpDestFile" as parameter $1 to "uploaddisabledtext"
== Bugfixes since 1.10 ==

17
includes/OutputPage.php
View file

@ -796,13 +796,13 @@ class OutputPage {
}
/**
* Outputs a pretty page to explain why the request exploded.
* Output a standard error page
*
* @param string $title Message key for page title.
* @param string $msg Message key for page text.
* @return nothing
* @param string $title Message key for page title
* @param string $msg Message key for page text
* @param array $params Message parameters
*/
public function showErrorPage( $title, $msg ) {
public function showErrorPage( $title, $msg, $params = array() ) {
global $wgTitle;
$this->mDebugtext .= 'Original title: ' .
@ -813,9 +813,12 @@ class OutputPage {
$this->setArticleRelated( false );
$this->enableClientCache( false );
$this->mRedirect = '';
$this->mBodytext = '';
$this->addWikiText( wfMsg( $msg ) );
array_unshift( $params, $msg );
$message = call_user_func_array( 'wfMsg', $params );
$this->addWikiText( $message );
$this->returnToMain( false );
}

2
includes/SpecialUpload.php
View file

@ -209,7 +209,7 @@ class UploadForm {
# Check uploading enabled
if( !$wgEnableUploads ) {
$wgOut->showErrorPage( 'uploaddisabled', 'uploaddisabledtext' );
$wgOut->showErrorPage( 'uploaddisabled', 'uploaddisabledtext', array( $this->mDestFile ) );
return;
}