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

Docs: Fix `@link` URLs in `get_merged_data()` Docblock. 

This addresses some 404s found on Helphub links by replacing the related `@link` sources.

See #54729.

Built from https://develop.svn.wordpress.org/trunk@53176


git-svn-id: http://core.svn.wordpress.org/trunk@52765 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
audrasjb 2022-04-14 06:05:11 +00:00
parent ed4829b0ee
commit 39052a81e6
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
wp-includes/class-wp-theme-json-resolver.php
View File

@ -350,12 +350,13 @@ class WP_Theme_JSON_Resolver {
* default, theme, and custom. The custom's has higher priority * default, theme, and custom. The custom's has higher priority
* than the theme's, and the theme's higher than default's. * than the theme's, and the theme's higher than default's.
* *
* Unlike the getters {@link get_core_data}, * Unlike the getters
* {@link get_theme_data}, and {@link get_user_data}, * {@link https://developer.wordpress.org/reference/classes/wp_theme_json_resolver/get_core_data/ get_core_data},
* this method returns data after it has been merged * {@link https://developer.wordpress.org/reference/classes/wp_theme_json_resolver/get_theme_data/ get_theme_data},
* with the previous origins. This means that if the same piece of data * and {@link https://developer.wordpress.org/reference/classes/wp_theme_json_resolver/get_user_data/ get_user_data},
* is declared in different origins (user, theme, and core), * this method returns data after it has been merged with the previous origins.
* the last origin overrides the previous. * This means that if the same piece of data is declared in different origins
* (user, theme, and core), the last origin overrides the previous.
* *
* For example, if the user has set a background color * For example, if the user has set a background color
* for the paragraph block, and the theme has done it as well, * for the paragraph block, and the theme has done it as well,

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '6.0-beta1-53175'; $wp_version = '6.0-beta1-53176';
/** /**
* 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.