From: Ian Baker <raindrift@users.mediawiki.org>
Date: Thu, 21 Jul 2011 22:28:11 +0000 (+0000)
Subject: Actually alias sessionkey to filekey, fixes bug in r92459
X-Git-Tag: 1.31.0-rc.0~28691
X-Git-Url: http://git.cyclocoop.org/%22.%24image2.%22?a=commitdiff_plain;h=ee926cf3367a62aa6d7a4619079e210705ee480d;p=lhc%2Fweb%2Fwiklou.git

Actually alias sessionkey to filekey, fixes bug in r92459
---

diff --git a/includes/api/ApiQueryStashImageInfo.php b/includes/api/ApiQueryStashImageInfo.php
index b190302555..d9a5f6be1d 100644
--- a/includes/api/ApiQueryStashImageInfo.php
+++ b/includes/api/ApiQueryStashImageInfo.php
@@ -45,6 +45,11 @@ class ApiQueryStashImageInfo extends ApiQueryImageInfo {
 			$this->dieUsage( "One of filekey or sessionkey must be supplied", 'nofilekey');
 		}
 
+		// Alias sessionkey to filekey, but give an existing filekey precedence.
+		if ( !$params['filekey'] && $params['sessionkey'] ) {
+			$params['filekey'] = $params['sessionkey'];
+		}
+
 		try {
 			$stash = RepoGroup::singleton()->getLocalRepo()->getUploadStash();