r95672 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r95671‎ | r95672 | r95673 >
Date:15:49, 29 August 2011
Author:neilk
Status:ok
Tags:
Comment:
MFT of r95581, fixes bug#30505
Modified paths:
  • /branches/wmf/1.17wmf1/includes/upload/UploadFromStash.php (modified) (history)

Diff [purge]

Index: branches/wmf/1.17wmf1/includes/upload/UploadFromStash.php
@@ -101,10 +101,10 @@
102102 }
103103
104104 /**
105 - * Alias for stashFile
 105+ * This should return the key instead of the UploadStashFile instance, for backward compatibility.
106106 */
107107 public function stashSession() {
108 - return $this->stashFile();
 108+ return $this->stashFile()->getFileKey();
109109 }
110110
111111 /**

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r95581UploadFromStash::stashSession returned an object instead of a file key, which...raindrift23:17, 26 August 2011
r95667merge r94966, r95581 into core -- will fix some fatals in prod, such as bug #...neilk15:37, 29 August 2011

Status & tagging log