From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Wed, 28 Jan 2009 19:29:04 +0000 (+0000)
Subject: (bug 15811) Also remove license template cruft on re-upload
X-Git-Tag: 1.31.0-rc.0~43169
X-Git-Url: https://git.cyclocoop.org/%28%28?a=commitdiff_plain;h=70992c734b79d1afcc1aeb2512bcd61a1e2c8539;p=lhc%2Fweb%2Fwiklou.git

(bug 15811) Also remove license template cruft on re-upload
---

diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php
index 7529d473fd..6d98d959cd 100644
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -566,8 +566,10 @@ class UploadForm {
 		 * Try actually saving the thing...
 		 * It will show an error form on failure.
 		 */
-		$pageText = self::getInitialPageText( $this->mComment, $this->mLicense,
-			$this->mCopyrightStatus, $this->mCopyrightSource );
+		if( !$this->mReUpload ) {
+			$pageText = self::getInitialPageText( $this->mComment, $this->mLicense,
+				$this->mCopyrightStatus, $this->mCopyrightSource );
+		}	
 
 		$status = $this->mLocalFile->upload( $this->mTempPath, $this->mComment, $pageText,
 			File::DELETE_SOURCE, $this->mFileProps );