From: Tim Starling <tstarling@users.mediawiki.org>
Date: Thu, 13 May 2010 15:09:57 +0000 (+0000)
Subject: Avoid E_NOTICE when texttop or textaftersummary is not specified. To support extensio... 
X-Git-Tag: 1.31.0-rc.0~36866
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=51864d4baa849e8326e6eb466fcf3bcb22eeca9b;p=lhc%2Fweb%2Fwiklou.git

Avoid E_NOTICE when texttop or textaftersummary is not specified. To support extensions such as UploadWizard. Patch by Michael Dale.
---

diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php
index 154f4a6f3d..33ed9f54e9 100644
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -732,8 +732,11 @@ class UploadForm extends HTMLForm {
 		$this->mHideIgnoreWarning = !empty( $options['hideignorewarning'] );
 		$this->mDestWarningAck = !empty( $options['destwarningack'] );
 
-		$this->mTextTop = $options['texttop'];
-		$this->mTextAfterSummary = $options['textaftersummary'];
+		$this->mTextTop = isset( $options['texttop'] )
+			? $options['texttop'] : '';
+
+		$this->mTextAfterSummary = isset( $options['textaftersummary'] )
+			? $options['textaftersummary'] : ''; 
 
 		$sourceDescriptor = $this->getSourceSection();
 		$descriptor = $sourceDescriptor