From: Bryan Tong Minh <btongminh@users.mediawiki.org>
Date: Tue, 27 Oct 2009 22:32:40 +0000 (+0000)
Subject: * Fix hook invocation
X-Git-Tag: 1.31.0-rc.0~39071
X-Git-Url: http://git.cyclocoop.org/%22.%24image2.%22?a=commitdiff_plain;h=bd7210698043d9fea07a9ea41734058513ab951b;p=lhc%2Fweb%2Fwiklou.git

* Fix hook invocation
* Fix fatal error on certain errors
---

diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php
index 4dcedb2517..13bf30106d 100644
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -334,7 +334,7 @@ class SpecialUpload extends SpecialPage {
 		// Fetch the file if required
 		$status = $this->mUpload->fetchFile();
 		if( !$status->isOK() )
-			return $this->mainUploadForm( $wgOut->parse( $status->getWikiText() ) );
+			return $this->showUploadForm( $this->getUploadForm( $wgOut->parse( $status->getWikiText() ) ) );
 
 		// Upload verification
 		$details = $this->mUpload->verifyUpload();
@@ -452,7 +452,7 @@ class SpecialUpload extends SpecialPage {
 
 			/** Statuses that require reuploading **/
 			case UploadBase::EMPTY_FILE:
-				$this->mainUploadForm( wfMsgHtml( 'emptyfile' ) );
+				$this->showUploadForm( $this->getUploadForm( wfMsgHtml( 'emptyfile' ) ) );
 				break;
 			case UploadBase::FILETYPE_BADTYPE:
 				$finalExt = $details['finalExt'];
@@ -729,7 +729,7 @@ class UploadForm extends HTMLForm {
 				'checked' => $selectedSourceType == 'url',
 			);
 		}
-		wfRunHooks( 'UploadFormSourceDescriptors', array( $descriptor, &$radio, $selectedSourceType ) );
+		wfRunHooks( 'UploadFormSourceDescriptors', array( &$descriptor, &$radio, $selectedSourceType ) );
 
 		$descriptor['Extensions'] = array(
 			'type' => 'info',