From eea4277c9e0d7434a08e9c827809d27908c000bf Mon Sep 17 00:00:00 2001
From: Jonathan Desrosiers <desrosj@git.wordpress.org>
Date: Wed, 21 Sep 2022 19:46:40 +0000
Subject: [PATCH] Network and Sites: Move `global_terms_enabled()` to its
 proper final resting place.

When initially deprecated in [54240], `global_terms_enabled()` was incorrectly moved to the `wp-includes/ms-deprecated.php` file. This file is only loaded for multisite installs.

The function previously lived in `wp-includes/functions.php`, which is loaded for all sites. The proper deprecated file is `wp-includes/deprecated.php`.

Props vikasprogrammer, davidbaumwald, courane01, desrosj.
Fixes #21734.

git-svn-id: https://develop.svn.wordpress.org/trunk@54283 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/deprecated.php    | 15 +++++++++++++++
 src/wp-includes/ms-deprecated.php | 14 --------------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/wp-includes/deprecated.php b/src/wp-includes/deprecated.php
index 6f4be5bf38..634fd0f1b6 100644
--- a/src/wp-includes/deprecated.php
+++ b/src/wp-includes/deprecated.php
@@ -4496,3 +4496,18 @@ function wp_typography_get_css_variable_inline_style( $attributes, $feature, $cs
 	// Return the actual CSS inline style e.g. `text-decoration:var(--wp--preset--text-decoration--underline);`.
 	return sprintf( '%s:var(--wp--preset--%s--%s);', $css_property, $css_property, $slug );
 }
+
+/**
+ * Determines whether global terms are enabled.
+ *
+ * @since 3.0.0
+ * @since 6.1.0 This function now always returns false.
+ * @deprecated 6.1.0
+ *
+ * @return bool Always returns false.
+ */
+function global_terms_enabled() {
+	_deprecated_function( __FUNCTION__, '6.1.0' );
+
+	return false;
+}
diff --git a/src/wp-includes/ms-deprecated.php b/src/wp-includes/ms-deprecated.php
index 224dc1586d..a0553421d5 100644
--- a/src/wp-includes/ms-deprecated.php
+++ b/src/wp-includes/ms-deprecated.php
@@ -730,20 +730,6 @@ function update_user_status( $id, $pref, $value, $deprecated = null ) {
 
 	return $value;
 }
-/**
- * Determines whether global terms are enabled.
- *
- * @since 3.0.0
- * @since 6.1.0 This function now always returns false.
- * @deprecated 6.1.0
- *
- * @return bool Always returns false.
- */
-function global_terms_enabled() {
-	_deprecated_function( __FUNCTION__, '6.1.0' );
-
-	return false;
-}
 
 /**
  * Maintains a canonical list of terms by syncing terms created for each blog with the global terms table.