From: Ian Baker <raindrift@users.mediawiki.org>
Date: Fri, 26 Aug 2011 23:17:43 +0000 (+0000)
Subject: UploadFromStash::stashSession returned an object instead of a file key, which broke... 
X-Git-Tag: 1.31.0-rc.0~28052
X-Git-Url: http://git.cyclocoop.org/url?a=commitdiff_plain;h=4840027b4dbb5901233942070cf8917f23a27160;p=lhc%2Fweb%2Fwiklou.git

UploadFromStash::stashSession returned an object instead of a file key, which broke stashing in SpecialUpload in some cases.

Fixes bug 30505
---

diff --git a/includes/upload/UploadFromStash.php b/includes/upload/UploadFromStash.php
index 8cb22ce5c9..62c672387a 100644
--- a/includes/upload/UploadFromStash.php
+++ b/includes/upload/UploadFromStash.php
@@ -115,10 +115,10 @@ class UploadFromStash extends UploadBase {
 	}
 
 	/**
-	 * Alias for stashFile
+	 * This should return the key instead of the UploadStashFile instance, for backward compatibility.
 	 */
 	public function stashSession() {
-		return $this->stashFile();
+		return $this->stashFile()->getFileKey();
 	}
 
 	/**