From: addshore <addshorewiki@gmail.com>
Date: Thu, 26 Jan 2017 19:12:57 +0000 (+0100)
Subject: Remove ArchivedFile::getUserText()
X-Git-Tag: 1.31.0-rc.0~4206
X-Git-Url: https://git.cyclocoop.org/%7B%7B%20url_for%28?a=commitdiff_plain;h=700a36ace05c4235785fb1d4dd0ae7a0e4b2dbc9;p=lhc%2Fweb%2Fwiklou.git

Remove ArchivedFile::getUserText()

Deprecated since 1.23
No usages found on gerrit

Change-Id: I037d56d6e57288753ae281388270d7e216707192
---

diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29
index 09ad0b56f3..330097b512 100644
--- a/RELEASE-NOTES-1.29
+++ b/RELEASE-NOTES-1.29
@@ -228,6 +228,7 @@ changes to languages because of Phabricator reports.
   see docs/hooks.txt.
 * User::crypt() (deprecated in 1.24) was removed.
 * User::comparePasswords() (deprecated in 1.24) was removed.
+* ArchivedFile::getUserText() (deprecated in 1.23) was removed.
 
 == Compatibility ==
 
diff --git a/includes/filerepo/file/ArchivedFile.php b/includes/filerepo/file/ArchivedFile.php
index 9a7a55be9e..6984d48c6d 100644
--- a/includes/filerepo/file/ArchivedFile.php
+++ b/includes/filerepo/file/ArchivedFile.php
@@ -492,22 +492,6 @@ class ArchivedFile {
 		throw new MWException( "Unknown type '$type'." );
 	}
 
-	/**
-	 * Return the user name of the uploader.
-	 *
-	 * @deprecated since 1.23 Use getUser( 'text' ) instead.
-	 * @return string|int
-	 */
-	public function getUserText() {
-		wfDeprecated( __METHOD__, '1.23' );
-		$this->load();
-		if ( $this->isDeleted( File::DELETED_USER ) ) {
-			return 0;
-		} else {
-			return $this->user_text;
-		}
-	}
-
 	/**
 	 * Return upload description.
 	 *