From: James D. Forrester <jforrester@wikimedia.org>
Date: Fri, 21 Jun 2019 21:16:14 +0000 (-0700)
Subject: Drop wfResetSessionID, deprecated in 1.27
X-Git-Tag: 1.34.0-rc.0~1287^2~1
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=348a29f3e47c93df503946aff2ba74cc7bc0b951

Drop wfResetSessionID, deprecated in 1.27

Change-Id: I14a9c91a43504ee02aac809f5e1124e1cb958e19
---

diff --git a/RELEASE-NOTES-1.34 b/RELEASE-NOTES-1.34
index 43e128af8c..8dab974089 100644
--- a/RELEASE-NOTES-1.34
+++ b/RELEASE-NOTES-1.34
@@ -239,6 +239,8 @@ because of Phabricator reports.
 * Skin::getDefaultInstance(), deprecated in 1.27, has been removed. Get the
   instance from MediaWikiServices instead.
 * The UserLoadFromSession hook, deprecated in 1.27, has been removed.
+* The wfResetSessionID global function, deprecated in 1.27, has been removed.
+  Use MediaWiki\Session\SessionManager instead.
 * …
 
 === Deprecations in 1.34 ===
diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index fed9234213..0f0a93bfc3 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -30,7 +30,6 @@ use MediaWiki\MediaWikiServices;
 use MediaWiki\ProcOpenError;
 use MediaWiki\Session\SessionManager;
 use MediaWiki\Shell\Shell;
-use Wikimedia\ScopedCallback;
 use Wikimedia\WrappedString;
 use Wikimedia\AtEase\AtEase;
 
@@ -2430,28 +2429,6 @@ function wfRelativePath( $path, $from ) {
 	return implode( DIRECTORY_SEPARATOR, $pieces );
 }
 
-/**
- * Reset the session id
- *
- * @deprecated since 1.27, use MediaWiki\Session\SessionManager instead
- * @since 1.22
- */
-function wfResetSessionID() {
-	wfDeprecated( __FUNCTION__, '1.27' );
-	$session = SessionManager::getGlobalSession();
-	$delay = $session->delaySave();
-
-	$session->resetId();
-
-	// Make sure a session is started, since that's what the old
-	// wfResetSessionID() did.
-	if ( session_id() !== $session->getId() ) {
-		wfSetupSession( $session->getId() );
-	}
-
-	ScopedCallback::consume( $delay );
-}
-
 /**
  * Initialise php session
  *