From: Reedy <reedy@wikimedia.org>
Date: Wed, 30 Nov 2016 00:07:19 +0000 (+0000)
Subject: Remove $wgSessionsInMemcached
X-Git-Tag: 1.31.0-rc.0~4732^2
X-Git-Url: http://git.heureux-cyclage.org/?a=commitdiff_plain;ds=sidebyside;h=d6bdb6bb9a680133a3ca72237c8fcea0ae679ee7;p=lhc%2Fweb%2Fwiklou.git

Remove $wgSessionsInMemcached

Change-Id: Ia2b4d62ea504a3cb04f4c2bec49b16f155c8b0c9
---

diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29
index 386dee405e..da2eb7f749 100644
--- a/RELEASE-NOTES-1.29
+++ b/RELEASE-NOTES-1.29
@@ -53,6 +53,8 @@ changes to languages because of Phabricator reports.
 === Other changes in 1.29 ===
 * Database::getSearchEngine() (deprecated in 1.28) was removed. Use
   SearchEngineFactory::getSearchEngineClass() instead.
+* $wgSessionsInMemcached (deprecated in 1.20) was removed. No replacement is
+  required as all sessions are stored in Object Cache now.
 
 == Compatibility ==
 
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index eb778b5ae1..5557dca875 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -2365,13 +2365,6 @@ $wgMainStash = 'db-replicated';
  */
 $wgParserCacheExpireTime = 86400;
 
-/**
- * Deprecated alias for $wgSessionsInObjectCache.
- *
- * @deprecated since 1.20; Use $wgSessionsInObjectCache
- */
-$wgSessionsInMemcached = true;
-
 /**
  * @deprecated since 1.27, session data is always stored in object cache.
  */
diff --git a/includes/Setup.php b/includes/Setup.php
index 357c76d8d1..9f722afd86 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -462,7 +462,7 @@ if ( $wgMaximalPasswordLength !== false ) {
 }
 
 // Backwards compatibility warning
-if ( !$wgSessionsInObjectCache && !$wgSessionsInMemcached ) {
+if ( !$wgSessionsInObjectCache ) {
 	wfDeprecated( '$wgSessionsInObjectCache = false', '1.27' );
 	if ( $wgSessionHandler ) {
 		wfDeprecated( '$wgSessionsHandler', '1.27' );