From: James D. Forrester <jforrester@wikimedia.org>
Date: Tue, 3 Jul 2018 21:26:43 +0000 (-0700)
Subject: Defines: Drop DB_SLAVE, deprecated since 1.28
X-Git-Tag: 1.34.0-rc.0~1402^2
X-Git-Url: http://git.cyclocoop.org/?a=commitdiff_plain;h=0653e575fc641ee828a949b2e06a11a7500ab3cd;p=lhc%2Fweb%2Fwiklou.git

Defines: Drop DB_SLAVE, deprecated since 1.28

Change-Id: I9b48524bfa071c21e03c50e9e8231e4661917c78
---

diff --git a/RELEASE-NOTES-1.34 b/RELEASE-NOTES-1.34
index 12c038213e..cc1015c824 100644
--- a/RELEASE-NOTES-1.34
+++ b/RELEASE-NOTES-1.34
@@ -208,6 +208,7 @@ because of Phabricator reports.
 * SpecialEmailUser::validateTarget(), ::getTarget() without a sender/user
   specified, deprecated in 1.30, have been removed.
 * BufferingStatsdDataFactory::getBuffer(), deprecated in 1.30, has been removed.
+* The constant DB_SLAVE, deprecated in 1.28, has been removed. Use DB_REPLICA.
 * …
 
 === Deprecations in 1.34 ===
diff --git a/includes/Defines.php b/includes/Defines.php
index 5f98b443c8..e5cd5ed64d 100644
--- a/includes/Defines.php
+++ b/includes/Defines.php
@@ -30,10 +30,6 @@ use Wikimedia\Rdbms\IDatabase;
  */
 
 # Obsolete aliases
-/**
- * @deprecated since 1.28, use DB_REPLICA instead
- */
-define( 'DB_SLAVE', -1 );
 
 /**@{
  * Obsolete IDatabase::makeList() constants