r95581 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r95580‎ | r95581 | r95582 >
Date:23:17, 26 August 2011
Author:raindrift
Status:ok
Tags:
Comment:
UploadFromStash::stashSession returned an object instead of a file key, which broke stashing in SpecialUpload in some cases.

Fixes bug 30505
Modified paths:
  • /trunk/phase3/includes/upload/UploadFromStash.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/upload/UploadFromStash.php
——@@ -115,10 +115,10 @@
116116 }
117117
118118 /**
119 - * Alias for stashFile
 119+ * This should return the key instead of the UploadStashFile instance, for backward compatibility.
120120 */
121121 public function stashSession() {
122 - return $this->stashFile();
 122+ return $this->stashFile()->getFileKey();
123123 }
124124
125125 /**

Sign-offs

UserFlagDate
Bawolfftested00:47, 29 August 2011

Follow-up revisions

RevisionCommit summaryAuthorDate
r95667merge r94966, r95581 into core -- will fix some fatals in prod, such as bug #...neilk15:37, 29 August 2011
r95672MFT of r95581, fixes bug#30505neilk15:49, 29 August 2011

Status & tagging log