WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
Built from https://develop.svn.wordpress.org/trunk@54283


git-svn-id: http://core.svn.wordpress.org/trunk@53842 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
desrosj 2022-09-21 19:48:13 +00:00
parent 685acca99c
commit 9bc97dca8c
3 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
wp-includes/deprecated.php
View File

@ -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 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 ); 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;
}

14
wp-includes/ms-deprecated.php
View File

@ -730,20 +730,6 @@ function update_user_status( $id, $pref, $value, $deprecated = null ) {
return $value; 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. * Maintains a canonical list of terms by syncing terms created for each blog with the global terms table.

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '6.1-beta1-54282'; $wp_version = '6.1-beta1-54283';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.