From: Sam Reed <reedy@users.mediawiki.org>
Date: Sun, 27 Feb 2011 21:11:45 +0000 (+0000)
Subject: Tweak documentation
X-Git-Tag: 1.31.0-rc.0~31732
X-Git-Url: http://git.cyclocoop.org/%7B%7B%20url_for%28%27admin_vote_add%27%29%20%7D%7D?a=commitdiff_plain;h=c07330264d560d666ef3dbc48be8649c818ad804;p=lhc%2Fweb%2Fwiklou.git

Tweak documentation

Fix constant use in UploadTest
---

diff --git a/includes/filerepo/FileRepo.php b/includes/filerepo/FileRepo.php
index 6077722a27..eced31290b 100644
--- a/includes/filerepo/FileRepo.php
+++ b/includes/filerepo/FileRepo.php
@@ -701,6 +701,8 @@ abstract class FileRepo {
 	
 	/**
 	 * Get an UploadStash associated with this repo.
+	 *
+	 * @return UploadStash
 	 */
 	function getUploadStash() {
 		return new UploadStash( $this );
diff --git a/includes/upload/UploadBase.php b/includes/upload/UploadBase.php
index 037aa8353b..fdbd0fcf81 100644
--- a/includes/upload/UploadBase.php
+++ b/includes/upload/UploadBase.php
@@ -707,7 +707,7 @@ abstract class UploadBase {
 	 * API request to find this stashed file again.
 	 *
 	 * @param $key String: (optional) the session key used to find the file info again. If not supplied, a key will be autogenerated.
-	 * @return File stashed file
+	 * @return UploadStashFile stashed file
 	 */
 	public function stashSessionFile( $key = null ) { 
 		$stash = RepoGroup::singleton()->getLocalRepo()->getUploadStash();
diff --git a/tests/phpunit/includes/UploadTest.php b/tests/phpunit/includes/UploadTest.php
index ebec1b141e..da19c90dbf 100644
--- a/tests/phpunit/includes/UploadTest.php
+++ b/tests/phpunit/includes/UploadTest.php
@@ -106,7 +106,7 @@ class UploadTest extends MediaWikiTestCase {
 		unlink( $filename );
 
 		$this->assertEquals(
-			array( 'status' => UploadTestHandler::OK ), $result );
+			array( 'status' => UploadBase::OK ), $result );
 
 		$wgMaxUploadSize = $savedGlobal;  // restore global
 	}