From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 7 Aug 2019 17:50:22 +0000 (+0000)
Subject: Merge "filebackend: deprecate FileBackend::getWikiId()"
X-Git-Tag: 1.34.0-rc.0~757
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/pie.php?a=commitdiff_plain;h=b60a756e3068d51c790b9170b3a259a8802d0580;hp=c19031b21f2bf27be3206e050df585b059882dac;p=lhc%2Fweb%2Fwiklou.git

Merge "filebackend: deprecate FileBackend::getWikiId()"
---

diff --git a/RELEASE-NOTES-1.34 b/RELEASE-NOTES-1.34
index 8ecc469d67..d9ad6dacf9 100644
--- a/RELEASE-NOTES-1.34
+++ b/RELEASE-NOTES-1.34
@@ -413,6 +413,8 @@ because of Phabricator reports.
   template option 'searchaction' instead.
 * LoadBalancer::haveIndex() and LoadBalancer::isNonZeroLoad() have
   been deprecated.
+* FileBackend::getWikiId() has been deprecated.
+  Use FileBackend::getDomainId() instead.
 * User::getRights() and User::$mRights have been deprecated. Use
   PermissionManager::getUserPermissions() instead.
 * The LocalisationCacheRecache hook no longer allows purging of message blobs
diff --git a/includes/libs/filebackend/FileBackend.php b/includes/libs/filebackend/FileBackend.php
index 4ad48c70c1..f65619fd8c 100644
--- a/includes/libs/filebackend/FileBackend.php
+++ b/includes/libs/filebackend/FileBackend.php
@@ -225,6 +225,7 @@ abstract class FileBackend implements LoggerAwareInterface {
 	 * Alias to getDomainId()
 	 * @return string
 	 * @since 1.20
+	 * @deprecated Since 1.34 Use getDomainId()
 	 */
 	final public function getWikiId() {
 		return $this->getDomainId();