http://www.mediawiki.org/wiki/Special:Code/MediaWiki/95672
Revision: 95672
Author: neilk
Date: 2011-08-29 15:49:01 +0000 (Mon, 29 Aug 2011)
Log Message:
-----------
MFT of r95581, fixes bug#30505
Modified Paths:
--------------
branches/wmf/1.17wmf1/includes/upload/UploadFromStash.php
Modified: branches/wmf/1.17wmf1/includes/upload/UploadFromStash.php
===================================================================
--- branches/wmf/1.17wmf1/includes/upload/UploadFromStash.php 2011-08-29
15:46:45 UTC (rev 95671)
+++ branches/wmf/1.17wmf1/includes/upload/UploadFromStash.php 2011-08-29
15:49:01 UTC (rev 95672)
@@ -101,10 +101,10 @@
}
/**
- * 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();
}
/**
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
