Merge "Deprecate hacky wfSplitWikiID() method"

diff --git a/RELEASE-NOTES-1.33 b/RELEASE-NOTES-1.33
index e3bd208..999cda8 100644 (file)
--- a/RELEASE-NOTES-1.33
+++ b/RELEASE-NOTES-1.33
@@ -81,6 +81,8 @@ because of Phabricator reports.
 * The LegacyHookPreAuthenticationProvider class, deprecated since its creation
   in 1.27 as part of the AuthManager re-write, now emits deprecation warnings.
   This will help identify the issue if you added it to $wgAuthManagerConfig.
+* wfSplitWikiId() is now deprecated. Cache key generation should have the wiki
+  domain ID as a key component and use makeGlobalKey().
 * …
 
 === Other changes in 1.33 ===

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 4531b54..6e95871 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -2656,6 +2656,7 @@ function wfWikiID() {
  * @param string $wiki
  *
  * @return array
+ * @deprecated 1.32
  */
 function wfSplitWikiID( $wiki ) {
        $bits = explode( '-', $wiki, 2 );