diff --git a/src/wp-includes/IXR/class-IXR-message.php b/src/wp-includes/IXR/class-IXR-message.php
index 2b27293f52cb8..60e4219737a02 100644
--- a/src/wp-includes/IXR/class-IXR-message.php
+++ b/src/wp-includes/IXR/class-IXR-message.php
@@ -93,9 +93,8 @@ function parse()
// Set XML parser to take the case of tags in to account
xml_parser_set_option($this->_parser, XML_OPTION_CASE_FOLDING, false);
// Set XML parser callback functions
- xml_set_object($this->_parser, $this);
- xml_set_element_handler($this->_parser, 'tag_open', 'tag_close');
- xml_set_character_data_handler($this->_parser, 'cdata');
+ xml_set_element_handler($this->_parser, array($this, 'tag_open'), array($this, 'tag_close'));
+ xml_set_character_data_handler($this->_parser, array($this, 'cdata'));
// 256Kb, parse in chunks to avoid the RAM usage on very large messages
$chunk_size = 262144;
diff --git a/src/wp-includes/Text/Diff.php b/src/wp-includes/Text/Diff.php
index eee4e4f8ea531..b3c63afc5f859 100644
--- a/src/wp-includes/Text/Diff.php
+++ b/src/wp-includes/Text/Diff.php
@@ -276,7 +276,7 @@ function _check($from_lines, $to_lines)
$prevtype = null;
foreach ($this->_edits as $edit) {
- if ($edit instanceof $prevtype) {
+ if ($prevtype !== null && $edit instanceof $prevtype) {
trigger_error("Edit sequence is non-optimal", E_USER_ERROR);
}
$prevtype = get_class($edit);
diff --git a/src/wp-includes/assets/script-loader-packages.min.php b/src/wp-includes/assets/script-loader-packages.min.php
index 5749a44088e68..34929fab434b8 100644
--- a/src/wp-includes/assets/script-loader-packages.min.php
+++ b/src/wp-includes/assets/script-loader-packages.min.php
@@ -1 +1 @@
- array('dependencies' => array('wp-dom-ready', 'wp-i18n'), 'version' => 'd90eebea464f6c09bfd5'), 'annotations.min.js' => array('dependencies' => array('wp-data', 'wp-hooks', 'wp-i18n', 'wp-rich-text'), 'version' => '238360e96c76d37a2468'), 'api-fetch.min.js' => array('dependencies' => array('wp-i18n', 'wp-url'), 'version' => '4c185334c5ec26e149cc'), 'autop.min.js' => array('dependencies' => array(), 'version' => '9fb50649848277dd318d'), 'blob.min.js' => array('dependencies' => array(), 'version' => '9113eed771d446f4a556'), 'block-directory.min.js' => array('dependencies' => array('react-jsx-runtime', 'wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-notices', 'wp-plugins', 'wp-primitives', 'wp-private-apis', 'wp-url'), 'version' => '286a70e45f3a8522a72a'), 'block-editor.min.js' => array('dependencies' => array('react', 'react-dom', 'react-jsx-runtime', 'wp-a11y', 'wp-api-fetch', 'wp-blob', 'wp-blocks', 'wp-commands', 'wp-components', 'wp-compose', 'wp-data', 'wp-date', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-is-shallow-equal', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-notices', 'wp-preferences', 'wp-primitives', 'wp-private-apis', 'wp-rich-text', 'wp-style-engine', 'wp-token-list', 'wp-url', 'wp-warning', 'wp-wordcount'), 'version' => '7ab6a9fdca1a0386ea66'), 'block-library.min.js' => array('dependencies' => array('react-jsx-runtime', 'wp-a11y', 'wp-api-fetch', 'wp-autop', 'wp-blob', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-date', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-escape-html', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-notices', 'wp-patterns', 'wp-primitives', 'wp-private-apis', 'wp-rich-text', 'wp-server-side-render', 'wp-url', 'wp-viewport', 'wp-wordcount'), 'version' => '96b614e020e4ab48838d'), 'block-serialization-default-parser.min.js' => array('dependencies' => array(), 'version' => '14d44daebf663d05d330'), 'blocks.min.js' => array('dependencies' => array('react-jsx-runtime', 'wp-autop', 'wp-blob', 'wp-block-serialization-default-parser', 'wp-data', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-is-shallow-equal', 'wp-private-apis', 'wp-rich-text', 'wp-shortcode'), 'version' => '0d232d232463200f5cfd'), 'commands.min.js' => array('dependencies' => array('react', 'react-dom', 'react-jsx-runtime', 'wp-components', 'wp-data', 'wp-element', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-primitives', 'wp-private-apis'), 'version' => '73d702f6367f60b06d89'), 'components.min.js' => array('dependencies' => array('react', 'react-dom', 'react-jsx-runtime', 'wp-a11y', 'wp-compose', 'wp-date', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-escape-html', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-is-shallow-equal', 'wp-keycodes', 'wp-primitives', 'wp-private-apis', 'wp-rich-text', 'wp-warning'), 'version' => '36b97398bf090476214e'), 'compose.min.js' => array('dependencies' => array('react', 'react-jsx-runtime', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-is-shallow-equal', 'wp-keycodes', 'wp-priority-queue'), 'version' => 'b8d54449305350b51869'), 'core-commands.min.js' => array('dependencies' => array('react-jsx-runtime', 'wp-commands', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-element', 'wp-i18n', 'wp-primitives', 'wp-private-apis', 'wp-router', 'wp-url'), 'version' => 'c81574a3c95e631df2a9'), 'core-data.min.js' => array('dependencies' => array('react-jsx-runtime', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-element', 'wp-html-entities', 'wp-i18n', 'wp-is-shallow-equal', 'wp-private-apis', 'wp-rich-text', 'wp-url'), 'version' => '07feee0ca98b13ab617d'), 'customize-widgets.min.js' => array('dependencies' => array('react-jsx-runtime', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-is-shallow-equal', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-preferences', 'wp-primitives', 'wp-private-apis', 'wp-widgets'), 'version' => '9b7db92a95af0a39ae98'), 'data.min.js' => array('dependencies' => array('react-jsx-runtime', 'wp-compose', 'wp-deprecated', 'wp-element', 'wp-is-shallow-equal', 'wp-priority-queue', 'wp-private-apis', 'wp-redux-routine'), 'version' => '7c62e39de0308c73d50c'), 'data-controls.min.js' => array('dependencies' => array('wp-api-fetch', 'wp-data', 'wp-deprecated'), 'version' => '49f5587e8b90f9e7cc7e'), 'date.min.js' => array('dependencies' => array('moment', 'wp-deprecated'), 'version' => 'aaca6387d1cf924acc51'), 'deprecated.min.js' => array('dependencies' => array('wp-hooks'), 'version' => 'e1f84915c5e8ae38964c'), 'dom.min.js' => array('dependencies' => array('wp-deprecated'), 'version' => '4ecffbffba91b10c5c7a'), 'dom-ready.min.js' => array('dependencies' => array(), 'version' => 'f77871ff7694fffea381'), 'edit-post.min.js' => array('dependencies' => array('react-jsx-runtime', 'wp-api-fetch', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-commands', 'wp-components', 'wp-compose', 'wp-core-commands', 'wp-core-data', 'wp-data', 'wp-deprecated', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-notices', 'wp-plugins', 'wp-preferences', 'wp-primitives', 'wp-private-apis', 'wp-url', 'wp-widgets'), 'version' => '914d3a541465a53adb05'), 'edit-site.min.js' => array('dependencies' => array('react', 'react-dom', 'react-jsx-runtime', 'wp-a11y', 'wp-api-fetch', 'wp-blob', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-commands', 'wp-components', 'wp-compose', 'wp-core-commands', 'wp-core-data', 'wp-data', 'wp-date', 'wp-deprecated', 'wp-dom', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-notices', 'wp-patterns', 'wp-plugins', 'wp-preferences', 'wp-primitives', 'wp-priority-queue', 'wp-private-apis', 'wp-router', 'wp-url', 'wp-widgets'), 'version' => 'ad45ba993152443a36b9'), 'edit-widgets.min.js' => array('dependencies' => array('react-jsx-runtime', 'wp-api-fetch', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-patterns', 'wp-plugins', 'wp-preferences', 'wp-primitives', 'wp-private-apis', 'wp-url', 'wp-viewport', 'wp-widgets'), 'version' => '974884730aac247c3a3e'), 'editor.min.js' => array('dependencies' => array('react', 'react-jsx-runtime', 'wp-a11y', 'wp-api-fetch', 'wp-blob', 'wp-block-editor', 'wp-blocks', 'wp-commands', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-date', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-patterns', 'wp-plugins', 'wp-preferences', 'wp-primitives', 'wp-private-apis', 'wp-rich-text', 'wp-server-side-render', 'wp-url', 'wp-viewport', 'wp-warning', 'wp-wordcount'), 'version' => '9b9729953f3754e74846'), 'element.min.js' => array('dependencies' => array('react', 'react-dom', 'wp-escape-html'), 'version' => 'cb762d190aebbec25b27'), 'escape-html.min.js' => array('dependencies' => array(), 'version' => '6561a406d2d232a6fbd2'), 'format-library.min.js' => array('dependencies' => array('react-jsx-runtime', 'wp-a11y', 'wp-block-editor', 'wp-components', 'wp-data', 'wp-element', 'wp-html-entities', 'wp-i18n', 'wp-primitives', 'wp-private-apis', 'wp-rich-text', 'wp-url'), 'version' => 'e3618e6d17a1146f03e4'), 'hooks.min.js' => array('dependencies' => array(), 'version' => '2810c76e705dd1a53b18'), 'html-entities.min.js' => array('dependencies' => array(), 'version' => '2cd3358363e0675638fb'), 'i18n.min.js' => array('dependencies' => array('wp-hooks'), 'version' => '5e580eb46a90c2b997e6'), 'is-shallow-equal.min.js' => array('dependencies' => array(), 'version' => 'e0f9f1d78d83f5196979'), 'keyboard-shortcuts.min.js' => array('dependencies' => array('react-jsx-runtime', 'wp-data', 'wp-element', 'wp-keycodes'), 'version' => '32686e58e84193ce808b'), 'keycodes.min.js' => array('dependencies' => array('wp-i18n'), 'version' => '034ff647a54b018581d3'), 'list-reusable-blocks.min.js' => array('dependencies' => array('react-jsx-runtime', 'wp-api-fetch', 'wp-blob', 'wp-components', 'wp-compose', 'wp-element', 'wp-i18n'), 'version' => '0eaedbf902a3af0eee37'), 'media-utils.min.js' => array('dependencies' => array('wp-api-fetch', 'wp-blob', 'wp-element', 'wp-i18n'), 'version' => '1cf582d3c080c8694c8c'), 'notices.min.js' => array('dependencies' => array('wp-data'), 'version' => '673a68a7ac2f556ed50b'), 'nux.min.js' => array('dependencies' => array('react-jsx-runtime', 'wp-components', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-element', 'wp-i18n', 'wp-primitives'), 'version' => 'b8f02a77b1489668fb50'), 'patterns.min.js' => array('dependencies' => array('react-jsx-runtime', 'wp-a11y', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-element', 'wp-html-entities', 'wp-i18n', 'wp-notices', 'wp-primitives', 'wp-private-apis', 'wp-url'), 'version' => '74acf014a3907af88267'), 'plugins.min.js' => array('dependencies' => array('react-jsx-runtime', 'wp-compose', 'wp-element', 'wp-hooks', 'wp-is-shallow-equal', 'wp-primitives'), 'version' => 'ef6da4a9b2747b62c09c'), 'preferences.min.js' => array('dependencies' => array('react-jsx-runtime', 'wp-a11y', 'wp-components', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-element', 'wp-i18n', 'wp-primitives', 'wp-private-apis'), 'version' => 'e7b06b8f8bdd714600e9'), 'preferences-persistence.min.js' => array('dependencies' => array('wp-api-fetch'), 'version' => '9307a8c9e3254140a223'), 'primitives.min.js' => array('dependencies' => array('react-jsx-runtime', 'wp-element'), 'version' => 'aef2543ab60c8c9bb609'), 'priority-queue.min.js' => array('dependencies' => array(), 'version' => '9c21c957c7e50ffdbf48'), 'private-apis.min.js' => array('dependencies' => array(), 'version' => '17a2e640b653d742da6e'), 'redux-routine.min.js' => array('dependencies' => array(), 'version' => 'a0a172871afaeb261566'), 'reusable-blocks.min.js' => array('dependencies' => array('react-jsx-runtime', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-core-data', 'wp-data', 'wp-element', 'wp-i18n', 'wp-notices', 'wp-primitives', 'wp-private-apis', 'wp-url'), 'version' => '5c420cb83017d586169a'), 'rich-text.min.js' => array('dependencies' => array('wp-a11y', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-element', 'wp-escape-html', 'wp-i18n', 'wp-keycodes'), 'version' => '4021b9e4e9ef4d3cd868'), 'router.min.js' => array('dependencies' => array('react-jsx-runtime', 'wp-element', 'wp-private-apis', 'wp-url'), 'version' => 'e4887fecc16ef03e908f'), 'server-side-render.min.js' => array('dependencies' => array('react-jsx-runtime', 'wp-api-fetch', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-element', 'wp-i18n', 'wp-url'), 'version' => '1e0f25c205ebeb30bcd2'), 'shortcode.min.js' => array('dependencies' => array(), 'version' => 'b7747eee0efafd2f0c3b'), 'style-engine.min.js' => array('dependencies' => array(), 'version' => '86ba6721a03e5b921dfe'), 'token-list.min.js' => array('dependencies' => array(), 'version' => '05f8a6df6258f0081718'), 'undo-manager.min.js' => array('dependencies' => array('wp-is-shallow-equal'), 'version' => 'f0698003cb0f0a7bd794'), 'url.min.js' => array('dependencies' => array(), 'version' => '36ae0e4dd9043bb8749b'), 'viewport.min.js' => array('dependencies' => array('react-jsx-runtime', 'wp-compose', 'wp-data'), 'version' => '829c9a30d366e1e5054c'), 'warning.min.js' => array('dependencies' => array(), 'version' => 'ed7c8b0940914f4fe44b'), 'widgets.min.js' => array('dependencies' => array('react-jsx-runtime', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-element', 'wp-i18n', 'wp-notices', 'wp-primitives'), 'version' => '53f9d5d5df6f21e39834'), 'wordcount.min.js' => array('dependencies' => array(), 'version' => '55d8c2bf3dc99e7ea5ec'));
+ array('dependencies' => array('wp-dom-ready', 'wp-i18n'), 'version' => '3156534cc54473497e14'), 'annotations.min.js' => array('dependencies' => array('wp-data', 'wp-hooks', 'wp-i18n', 'wp-rich-text'), 'version' => '238360e96c76d37a2468'), 'api-fetch.min.js' => array('dependencies' => array('wp-i18n', 'wp-url'), 'version' => 'd387b816bc1ed2042e28'), 'autop.min.js' => array('dependencies' => array(), 'version' => '9fb50649848277dd318d'), 'blob.min.js' => array('dependencies' => array(), 'version' => '9113eed771d446f4a556'), 'block-directory.min.js' => array('dependencies' => array('react-jsx-runtime', 'wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-notices', 'wp-plugins', 'wp-primitives', 'wp-url'), 'version' => 'daab93030a9a278a5004'), 'block-editor.min.js' => array('dependencies' => array('react', 'react-dom', 'react-jsx-runtime', 'wp-a11y', 'wp-api-fetch', 'wp-blob', 'wp-block-serialization-default-parser', 'wp-blocks', 'wp-commands', 'wp-components', 'wp-compose', 'wp-data', 'wp-date', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-is-shallow-equal', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-notices', 'wp-preferences', 'wp-primitives', 'wp-private-apis', 'wp-rich-text', 'wp-style-engine', 'wp-token-list', 'wp-url', 'wp-warning', 'wp-wordcount'), 'version' => 'f2f0fce87069c87bace8'), 'block-library.min.js' => array('dependencies' => array('react-jsx-runtime', 'wp-a11y', 'wp-api-fetch', 'wp-autop', 'wp-blob', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-date', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-escape-html', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-notices', 'wp-patterns', 'wp-primitives', 'wp-private-apis', 'wp-rich-text', 'wp-server-side-render', 'wp-url', 'wp-wordcount'), 'version' => '3c6720ae7d3edcf8e1d7'), 'block-serialization-default-parser.min.js' => array('dependencies' => array(), 'version' => '14d44daebf663d05d330'), 'blocks.min.js' => array('dependencies' => array('react-jsx-runtime', 'wp-autop', 'wp-blob', 'wp-block-serialization-default-parser', 'wp-data', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-is-shallow-equal', 'wp-private-apis', 'wp-rich-text', 'wp-shortcode', 'wp-warning'), 'version' => 'a048f58c97f33a3386d0'), 'commands.min.js' => array('dependencies' => array('react', 'react-dom', 'react-jsx-runtime', 'wp-components', 'wp-data', 'wp-element', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-primitives', 'wp-private-apis'), 'version' => '33b90579e9a6d83ac03b'), 'components.min.js' => array('dependencies' => array('react', 'react-dom', 'react-jsx-runtime', 'wp-a11y', 'wp-compose', 'wp-date', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-escape-html', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-is-shallow-equal', 'wp-keycodes', 'wp-primitives', 'wp-private-apis', 'wp-rich-text', 'wp-warning'), 'version' => '019cec4b20efcb54f9cb'), 'compose.min.js' => array('dependencies' => array('react', 'react-jsx-runtime', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-is-shallow-equal', 'wp-keycodes', 'wp-priority-queue'), 'version' => '85f0708cd2e6b26addeb'), 'core-commands.min.js' => array('dependencies' => array('react-jsx-runtime', 'wp-commands', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-element', 'wp-html-entities', 'wp-i18n', 'wp-notices', 'wp-primitives', 'wp-private-apis', 'wp-router', 'wp-url'), 'version' => 'e398c3f43e502a9c4a8f'), 'core-data.min.js' => array('dependencies' => array('react-jsx-runtime', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-element', 'wp-html-entities', 'wp-i18n', 'wp-is-shallow-equal', 'wp-private-apis', 'wp-rich-text', 'wp-url', 'wp-warning'), 'version' => '8224153d27ea1b378c5a'), 'customize-widgets.min.js' => array('dependencies' => array('react-jsx-runtime', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-is-shallow-equal', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-preferences', 'wp-primitives', 'wp-private-apis', 'wp-widgets'), 'version' => '6cc7ebe73bf2bd031694'), 'data.min.js' => array('dependencies' => array('react-jsx-runtime', 'wp-compose', 'wp-deprecated', 'wp-element', 'wp-is-shallow-equal', 'wp-priority-queue', 'wp-private-apis', 'wp-redux-routine'), 'version' => '7c62e39de0308c73d50c'), 'data-controls.min.js' => array('dependencies' => array('wp-api-fetch', 'wp-data', 'wp-deprecated'), 'version' => '49f5587e8b90f9e7cc7e'), 'date.min.js' => array('dependencies' => array('moment', 'wp-deprecated'), 'version' => 'aaca6387d1cf924acc51'), 'deprecated.min.js' => array('dependencies' => array('wp-hooks'), 'version' => 'e1f84915c5e8ae38964c'), 'dom.min.js' => array('dependencies' => array('wp-deprecated'), 'version' => '12d5349c9484c117ca0a'), 'dom-ready.min.js' => array('dependencies' => array(), 'version' => 'f77871ff7694fffea381'), 'edit-post.min.js' => array('dependencies' => array('react-jsx-runtime', 'wp-api-fetch', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-commands', 'wp-components', 'wp-compose', 'wp-core-commands', 'wp-core-data', 'wp-data', 'wp-deprecated', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-notices', 'wp-plugins', 'wp-preferences', 'wp-primitives', 'wp-private-apis', 'wp-url', 'wp-widgets'), 'version' => 'b53b02a471077974d376'), 'edit-site.min.js' => array('dependencies' => array('react', 'react-dom', 'react-jsx-runtime', 'wp-a11y', 'wp-api-fetch', 'wp-blob', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-commands', 'wp-components', 'wp-compose', 'wp-core-commands', 'wp-core-data', 'wp-data', 'wp-date', 'wp-deprecated', 'wp-dom', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-notices', 'wp-patterns', 'wp-plugins', 'wp-preferences', 'wp-primitives', 'wp-priority-queue', 'wp-private-apis', 'wp-router', 'wp-url', 'wp-warning', 'wp-widgets'), 'version' => '3dff6e450af16aa34cce'), 'edit-widgets.min.js' => array('dependencies' => array('react-jsx-runtime', 'wp-api-fetch', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-patterns', 'wp-plugins', 'wp-preferences', 'wp-primitives', 'wp-private-apis', 'wp-url', 'wp-viewport', 'wp-widgets'), 'version' => 'a711aac9b45816332045'), 'editor.min.js' => array('dependencies' => array('react', 'react-jsx-runtime', 'wp-a11y', 'wp-api-fetch', 'wp-blob', 'wp-block-editor', 'wp-blocks', 'wp-commands', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-date', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-patterns', 'wp-plugins', 'wp-preferences', 'wp-primitives', 'wp-private-apis', 'wp-rich-text', 'wp-server-side-render', 'wp-url', 'wp-viewport', 'wp-warning', 'wp-wordcount'), 'version' => 'f1fbf6c4576bd4a9e037'), 'element.min.js' => array('dependencies' => array('react', 'react-dom', 'wp-escape-html'), 'version' => 'cb762d190aebbec25b27'), 'escape-html.min.js' => array('dependencies' => array(), 'version' => '6561a406d2d232a6fbd2'), 'fields.min.js' => array('dependencies' => array('react-jsx-runtime', 'wp-blob', 'wp-components', 'wp-core-data', 'wp-data', 'wp-element', 'wp-html-entities', 'wp-i18n', 'wp-notices', 'wp-patterns', 'wp-primitives', 'wp-private-apis', 'wp-url'), 'version' => '0af196f4315c37bdb9ce'), 'format-library.min.js' => array('dependencies' => array('react-jsx-runtime', 'wp-a11y', 'wp-block-editor', 'wp-components', 'wp-data', 'wp-element', 'wp-html-entities', 'wp-i18n', 'wp-primitives', 'wp-private-apis', 'wp-rich-text', 'wp-url'), 'version' => '81b8a9364113f57b6a37'), 'hooks.min.js' => array('dependencies' => array(), 'version' => '2810c76e705dd1a53b18'), 'html-entities.min.js' => array('dependencies' => array(), 'version' => '2cd3358363e0675638fb'), 'i18n.min.js' => array('dependencies' => array('wp-hooks'), 'version' => '5e580eb46a90c2b997e6'), 'is-shallow-equal.min.js' => array('dependencies' => array(), 'version' => 'e0f9f1d78d83f5196979'), 'keyboard-shortcuts.min.js' => array('dependencies' => array('react-jsx-runtime', 'wp-data', 'wp-element', 'wp-keycodes'), 'version' => '32686e58e84193ce808b'), 'keycodes.min.js' => array('dependencies' => array('wp-i18n'), 'version' => '034ff647a54b018581d3'), 'list-reusable-blocks.min.js' => array('dependencies' => array('react-jsx-runtime', 'wp-api-fetch', 'wp-blob', 'wp-components', 'wp-compose', 'wp-element', 'wp-i18n'), 'version' => '9915c5bfec64e71b7a70'), 'media-utils.min.js' => array('dependencies' => array('wp-api-fetch', 'wp-blob', 'wp-element', 'wp-i18n'), 'version' => 'e10cc6bfcff4fe474479'), 'notices.min.js' => array('dependencies' => array('wp-data'), 'version' => '673a68a7ac2f556ed50b'), 'nux.min.js' => array('dependencies' => array('react-jsx-runtime', 'wp-components', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-element', 'wp-i18n', 'wp-primitives'), 'version' => '31635a0fcc2aaded88b0'), 'patterns.min.js' => array('dependencies' => array('react-jsx-runtime', 'wp-a11y', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-element', 'wp-html-entities', 'wp-i18n', 'wp-notices', 'wp-primitives', 'wp-private-apis', 'wp-url'), 'version' => '76c0157f8362b62fb78f'), 'plugins.min.js' => array('dependencies' => array('react-jsx-runtime', 'wp-compose', 'wp-element', 'wp-hooks', 'wp-is-shallow-equal', 'wp-primitives'), 'version' => 'ef6da4a9b2747b62c09c'), 'preferences.min.js' => array('dependencies' => array('react-jsx-runtime', 'wp-a11y', 'wp-components', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-element', 'wp-i18n', 'wp-primitives', 'wp-private-apis'), 'version' => '945c6cbfe821b3070047'), 'preferences-persistence.min.js' => array('dependencies' => array('wp-api-fetch'), 'version' => '9307a8c9e3254140a223'), 'primitives.min.js' => array('dependencies' => array('react-jsx-runtime', 'wp-element'), 'version' => 'aef2543ab60c8c9bb609'), 'priority-queue.min.js' => array('dependencies' => array(), 'version' => '9c21c957c7e50ffdbf48'), 'private-apis.min.js' => array('dependencies' => array(), 'version' => '4b858962c15c2c7a135f'), 'redux-routine.min.js' => array('dependencies' => array(), 'version' => 'a0a172871afaeb261566'), 'reusable-blocks.min.js' => array('dependencies' => array('react-jsx-runtime', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-core-data', 'wp-data', 'wp-element', 'wp-i18n', 'wp-notices', 'wp-primitives', 'wp-url'), 'version' => 'f5b3a15536e2ada82b9f'), 'rich-text.min.js' => array('dependencies' => array('wp-a11y', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-element', 'wp-escape-html', 'wp-i18n', 'wp-keycodes'), 'version' => '86a8ca2edefb8748ce5c'), 'router.min.js' => array('dependencies' => array('react-jsx-runtime', 'wp-element', 'wp-private-apis', 'wp-url'), 'version' => 'e4887fecc16ef03e908f'), 'server-side-render.min.js' => array('dependencies' => array('react-jsx-runtime', 'wp-api-fetch', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-element', 'wp-i18n', 'wp-url'), 'version' => '1e0f25c205ebeb30bcd2'), 'shortcode.min.js' => array('dependencies' => array(), 'version' => 'b7747eee0efafd2f0c3b'), 'style-engine.min.js' => array('dependencies' => array(), 'version' => '08cc10e9532531e22456'), 'token-list.min.js' => array('dependencies' => array(), 'version' => '3b5f5dcfde830ecef24f'), 'undo-manager.min.js' => array('dependencies' => array('wp-is-shallow-equal'), 'version' => 'f0698003cb0f0a7bd794'), 'url.min.js' => array('dependencies' => array(), 'version' => 'e87eb76272a3a08402d2'), 'viewport.min.js' => array('dependencies' => array('react-jsx-runtime', 'wp-compose', 'wp-data'), 'version' => '829c9a30d366e1e5054c'), 'warning.min.js' => array('dependencies' => array(), 'version' => 'ed7c8b0940914f4fe44b'), 'widgets.min.js' => array('dependencies' => array('react-jsx-runtime', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-element', 'wp-i18n', 'wp-notices', 'wp-primitives'), 'version' => 'e4801fc4b16effe444d8'), 'wordcount.min.js' => array('dependencies' => array(), 'version' => '55d8c2bf3dc99e7ea5ec'));
diff --git a/src/wp-includes/assets/script-modules-packages.min.php b/src/wp-includes/assets/script-modules-packages.min.php
new file mode 100644
index 0000000000000..e3c7915456748
--- /dev/null
+++ b/src/wp-includes/assets/script-modules-packages.min.php
@@ -0,0 +1 @@
+ array('dependencies' => array(), 'version' => '2d6d1fdbcb3fda39c768', 'type' => 'module'), 'interactivity/debug.min.js' => array('dependencies' => array(), 'version' => '1ccc67b05c275e51a8f8', 'type' => 'module'), 'interactivity-router/index.min.js' => array('dependencies' => array('@wordpress/interactivity'), 'version' => '64645ef3cd2d32860d7d', 'type' => 'module'), 'a11y/index.min.js' => array('dependencies' => array(), 'version' => 'b7d06936b8bc23cff2ad', 'type' => 'module'), 'block-library/file/view.min.js' => array('dependencies' => array('@wordpress/interactivity'), 'version' => 'fdc2f6842e015af83140', 'type' => 'module'), 'block-library/image/view.min.js' => array('dependencies' => array('@wordpress/interactivity'), 'version' => 'acfec7b3c0be4a859b31', 'type' => 'module'), 'block-library/navigation/view.min.js' => array('dependencies' => array('@wordpress/interactivity'), 'version' => '8ff192874fc8910a284c', 'type' => 'module'), 'block-library/query/view.min.js' => array('dependencies' => array('@wordpress/interactivity', array('id' => '@wordpress/interactivity-router', 'import' => 'dynamic')), 'version' => 'f4c91c89fa5271f3dad9', 'type' => 'module'), 'block-library/search/view.min.js' => array('dependencies' => array('@wordpress/interactivity'), 'version' => '2a73400a693958f604de', 'type' => 'module'));
diff --git a/src/wp-includes/atomlib.php b/src/wp-includes/atomlib.php
index 90f6282243cfe..0bcf09418b126 100644
--- a/src/wp-includes/atomlib.php
+++ b/src/wp-includes/atomlib.php
@@ -86,6 +86,10 @@ class AtomParser {
var $feed;
var $current;
+ var $map_attrs_func;
+ var $map_xmlns_func;
+ var $error;
+ var $content;
/**
* PHP5 constructor.
@@ -153,14 +157,13 @@ function parse() {
}
$parser = xml_parser_create_ns();
- xml_set_object($parser, $this);
- xml_set_element_handler($parser, "start_element", "end_element");
+ xml_set_element_handler($parser, array($this, "start_element"), array($this, "end_element"));
xml_parser_set_option($parser,XML_OPTION_CASE_FOLDING,0);
xml_parser_set_option($parser,XML_OPTION_SKIP_WHITE,0);
- xml_set_character_data_handler($parser, "cdata");
- xml_set_default_handler($parser, "_default");
- xml_set_start_namespace_decl_handler($parser, "start_ns");
- xml_set_end_namespace_decl_handler($parser, "end_ns");
+ xml_set_character_data_handler($parser, array($this, "cdata"));
+ xml_set_default_handler($parser, array($this, "_default"));
+ xml_set_start_namespace_decl_handler($parser, array($this, "start_ns"));
+ xml_set_end_namespace_decl_handler($parser, array($this, "end_ns"));
$this->content = '';
diff --git a/src/wp-includes/block-template-utils.php b/src/wp-includes/block-template-utils.php
index fb9076c42e8f4..29007811727f6 100644
--- a/src/wp-includes/block-template-utils.php
+++ b/src/wp-includes/block-template-utils.php
@@ -592,6 +592,15 @@ function _build_block_template_result_from_file( $template_file, $template_type
$template->is_custom = true;
$template->modified = null;
+ if ( 'wp_template' === $template_type ) {
+ $registered_template = WP_Block_Templates_Registry::get_instance()->get_by_slug( $template_file['slug'] );
+ if ( $registered_template ) {
+ $template->plugin = $registered_template->plugin;
+ $template->title = empty( $template->title ) || $template->title === $template->slug ? $registered_template->title : $template->title;
+ $template->description = empty( $template->description ) ? $registered_template->description : $template->description;
+ }
+ }
+
if ( 'wp_template' === $template_type && isset( $default_template_types[ $template_file['slug'] ] ) ) {
$template->description = $default_template_types[ $template_file['slug'] ]['description'];
$template->title = $default_template_types[ $template_file['slug'] ]['title'];
@@ -1014,6 +1023,19 @@ function _build_block_template_result_from_post( $post ) {
}
}
+ if ( 'wp_template' === $post->post_type ) {
+ $registered_template = WP_Block_Templates_Registry::get_instance()->get_by_slug( $template->slug );
+ if ( $registered_template ) {
+ $template->plugin = $registered_template->plugin;
+ $template->origin =
+ 'theme' !== $template->origin && 'theme' !== $template->source ?
+ 'plugin' :
+ $template->origin;
+ $template->title = empty( $template->title ) || $template->title === $template->slug ? $registered_template->title : $template->title;
+ $template->description = empty( $template->description ) ? $registered_template->description : $template->description;
+ }
+ }
+
$hooked_blocks = get_hooked_blocks();
if ( ! empty( $hooked_blocks ) || has_filter( 'hooked_block_types' ) ) {
$before_block_visitor = make_before_block_visitor( $hooked_blocks, $template, 'insert_hooked_blocks_and_set_ignored_hooked_blocks_metadata' );
@@ -1157,6 +1179,23 @@ function get_block_templates( $query = array(), $template_type = 'wp_template' )
foreach ( $template_files as $template_file ) {
$query_result[] = _build_block_template_result_from_file( $template_file, $template_type );
}
+
+ if ( 'wp_template' === $template_type ) {
+ // Add templates registered in the template registry. Filtering out the ones which have a theme file.
+ $registered_templates = WP_Block_Templates_Registry::get_instance()->get_by_query( $query );
+ $matching_registered_templates = array_filter(
+ $registered_templates,
+ function ( $registered_template ) use ( $template_files ) {
+ foreach ( $template_files as $template_file ) {
+ if ( $template_file['slug'] === $registered_template->slug ) {
+ return false;
+ }
+ }
+ return true;
+ }
+ );
+ $query_result = array_merge( $query_result, $matching_registered_templates );
+ }
}
/**
@@ -1287,18 +1326,17 @@ function get_block_file_template( $id, $template_type = 'wp_template' ) {
}
list( $theme, $slug ) = $parts;
- if ( get_stylesheet() !== $theme ) {
- /** This filter is documented in wp-includes/block-template-utils.php */
- return apply_filters( 'get_block_file_template', null, $id, $template_type );
- }
+ if ( get_stylesheet() === $theme ) {
+ $template_file = _get_block_template_file( $template_type, $slug );
+ if ( null !== $template_file ) {
+ $block_template = _build_block_template_result_from_file( $template_file, $template_type );
- $template_file = _get_block_template_file( $template_type, $slug );
- if ( null === $template_file ) {
- /** This filter is documented in wp-includes/block-template-utils.php */
- return apply_filters( 'get_block_file_template', null, $id, $template_type );
+ /** This filter is documented in wp-includes/block-template-utils.php */
+ return apply_filters( 'get_block_file_template', $block_template, $id, $template_type );
+ }
}
- $block_template = _build_block_template_result_from_file( $template_file, $template_type );
+ $block_template = WP_Block_Templates_Registry::get_instance()->get_by_slug( $slug );
/**
* Filters the block template object after it has been (potentially) fetched from the theme file.
@@ -1665,12 +1703,12 @@ function inject_ignored_hooked_blocks_metadata_attributes( $changes, $deprecated
);
}
- $content = get_comment_delimited_block_content(
+ $content = get_comment_delimited_block_content(
'core/template-part',
$attributes,
$changes->post_content
);
- $content = apply_block_hooks_to_content( $content, $template, 'set_ignored_hooked_blocks_metadata' );
+ $content = apply_block_hooks_to_content( $content, $template, 'set_ignored_hooked_blocks_metadata' );
$changes->post_content = remove_serialized_parent_block( $content );
$wrapper_block_markup = extract_serialized_parent_block( $content );
diff --git a/src/wp-includes/block-template.php b/src/wp-includes/block-template.php
index 0a4d85ac718a9..d42a74479c4e3 100644
--- a/src/wp-includes/block-template.php
+++ b/src/wp-includes/block-template.php
@@ -358,3 +358,38 @@ function _resolve_template_for_new_post( $wp_query ) {
$wp_query->set( 'post_status', 'auto-draft' );
}
}
+
+/**
+ * Register a block template.
+ *
+ * @since 6.7.0
+ *
+ * @param string $template_name Template name in the form of `plugin_uri//template_name`.
+ * @param array|string $args {
+ * @type string $title Optional. Title of the template as it will be shown in the Site Editor
+ * and other UI elements.
+ * @type string $description Optional. Description of the template as it will be shown in the Site
+ * Editor.
+ * @type string $content Optional. Default content of the template that will be used when the
+ * template is rendered or edited in the editor.
+ * @type string[] $post_types Optional. Array of post types to which the template should be available.
+ * @type string $plugin Optional. Slug of the plugin that registers the template.
+ * }
+ * @return WP_Block_Template|WP_Error The registered template object on success, WP_Error object on failure.
+ */
+function wp_register_block_template( $template_name, $args = array() ) {
+ return WP_Block_Templates_Registry::get_instance()->register( $template_name, $args );
+}
+
+/**
+ * Unregister a block template.
+ *
+ * @since 6.7.0
+ *
+ * @param string $template_name Template name in the form of `plugin_uri//template_name`.
+ * @return WP_Block_Template|WP_Error The unregistered template object on success, WP_Error object on failure or if the
+ * template doesn't exist.
+ */
+function wp_unregister_block_template( $template_name ) {
+ return WP_Block_Templates_Registry::get_instance()->unregister( $template_name );
+}
diff --git a/src/wp-includes/blocks.php b/src/wp-includes/blocks.php
index 1a8f3459c5632..a53092e04e4d7 100644
--- a/src/wp-includes/blocks.php
+++ b/src/wp-includes/blocks.php
@@ -1690,8 +1690,11 @@ function traverse_and_serialize_blocks( $blocks, $pre_callback = null, $post_cal
$result = '';
$parent_block = null; // At the top level, there is no parent block to pass to the callbacks; yet the callbacks expect a reference.
+ $pre_callback_is_callable = is_callable( $pre_callback );
+ $post_callback_is_callable = is_callable( $post_callback );
+
foreach ( $blocks as $index => $block ) {
- if ( is_callable( $pre_callback ) ) {
+ if ( $pre_callback_is_callable ) {
$prev = 0 === $index
? null
: $blocks[ $index - 1 ];
@@ -1702,7 +1705,7 @@ function traverse_and_serialize_blocks( $blocks, $pre_callback = null, $post_cal
);
}
- if ( is_callable( $post_callback ) ) {
+ if ( $post_callback_is_callable ) {
$next = count( $blocks ) - 1 === $index
? null
: $blocks[ $index + 1 ];
@@ -2564,11 +2567,6 @@ function build_comment_query_vars_from_block( $block ) {
$comment_args['paged'] = $max_num_pages;
}
}
- // Set the `cpage` query var to ensure the previous and next pagination links are correct
- // when inheriting the Discussion Settings.
- if ( 0 === $page && isset( $comment_args['paged'] ) && $comment_args['paged'] > 0 ) {
- set_query_var( 'cpage', $comment_args['paged'] );
- }
}
}
diff --git a/src/wp-includes/blocks/audio/block.json b/src/wp-includes/blocks/audio/block.json
index 14b44704fb7e8..bee2ff6d534a7 100644
--- a/src/wp-includes/blocks/audio/block.json
+++ b/src/wp-includes/blocks/audio/block.json
@@ -8,6 +8,10 @@
"keywords": [ "music", "sound", "podcast", "recording" ],
"textdomain": "default",
"attributes": {
+ "blob": {
+ "type": "string",
+ "__experimentalRole": "local"
+ },
"src": {
"type": "string",
"source": "attribute",
diff --git a/src/wp-includes/blocks/blocks-json.php b/src/wp-includes/blocks/blocks-json.php
index 46e84707f5822..36e11e4f53a1c 100644
--- a/src/wp-includes/blocks/blocks-json.php
+++ b/src/wp-includes/blocks/blocks-json.php
@@ -70,6 +70,10 @@
),
'textdomain' => 'default',
'attributes' => array(
+ 'blob' => array(
+ 'type' => 'string',
+ '__experimentalRole' => 'local'
+ ),
'src' => array(
'type' => 'string',
'source' => 'attribute',
@@ -328,6 +332,7 @@
'__experimentalTextTransform' => true,
'__experimentalTextDecoration' => true,
'__experimentalLetterSpacing' => true,
+ '__experimentalWritingMode' => true,
'__experimentalDefaultControls' => array(
'fontSize' => true
)
@@ -400,8 +405,19 @@
),
'html' => false,
'__experimentalExposeControlsToChildren' => true,
+ 'color' => array(
+ 'gradients' => true,
+ 'text' => false,
+ '__experimentalDefaultControls' => array(
+ 'background' => true
+ )
+ ),
'spacing' => array(
- 'blockGap' => true,
+ 'blockGap' => array(
+ 'horizontal',
+ 'vertical'
+ ),
+ 'padding' => true,
'margin' => array(
'top',
'bottom'
@@ -423,6 +439,18 @@
'fontSize' => true
)
),
+ '__experimentalBorder' => array(
+ 'color' => true,
+ 'radius' => true,
+ 'style' => true,
+ 'width' => true,
+ '__experimentalDefaultControls' => array(
+ 'color' => true,
+ 'radius' => true,
+ 'style' => true,
+ 'width' => true
+ )
+ ),
'layout' => array(
'allowSwitching' => false,
'allowInheriting' => false,
@@ -493,11 +521,18 @@
'$schema' => 'https://schemas.wp.org/trunk/block.json',
'apiVersion' => 3,
'name' => 'core/categories',
- 'title' => 'Categories List',
+ 'title' => 'Terms List',
'category' => 'widgets',
- 'description' => 'Display a list of all categories.',
+ 'description' => 'Display a list of all terms of a given taxonomy.',
+ 'keywords' => array(
+ 'categories'
+ ),
'textdomain' => 'default',
'attributes' => array(
+ 'taxonomy' => array(
+ 'type' => 'string',
+ 'default' => 'category'
+ ),
'displayAsDropdown' => array(
'type' => 'boolean',
'default' => false
@@ -517,8 +552,19 @@
'showEmpty' => array(
'type' => 'boolean',
'default' => false
+ ),
+ 'label' => array(
+ 'type' => 'string',
+ '__experimentalRole' => 'content'
+ ),
+ 'showLabel' => array(
+ 'type' => 'boolean',
+ 'default' => true
)
),
+ 'usesContext' => array(
+ 'enhancedPagination'
+ ),
'supports' => array(
'align' => true,
'html' => false,
@@ -545,6 +591,18 @@
),
'interactivity' => array(
'clientNavigation' => true
+ ),
+ '__experimentalBorder' => array(
+ 'radius' => true,
+ 'color' => true,
+ 'width' => true,
+ 'style' => true,
+ '__experimentalDefaultControls' => array(
+ 'radius' => true,
+ 'color' => true,
+ 'width' => true,
+ 'style' => true
+ )
)
),
'editorStyle' => 'wp-block-categories-editor',
@@ -680,10 +738,12 @@
),
'__experimentalBorder' => array(
'color' => true,
+ 'radius' => true,
'style' => true,
'width' => true,
'__experimentalDefaultControls' => array(
'color' => true,
+ 'radius' => true,
'style' => true,
'width' => true
)
@@ -873,8 +933,21 @@
),
'interactivity' => array(
'clientNavigation' => true
+ ),
+ '__experimentalBorder' => array(
+ 'radius' => true,
+ 'color' => true,
+ 'width' => true,
+ 'style' => true,
+ '__experimentalDefaultControls' => array(
+ 'radius' => true,
+ 'color' => true,
+ 'width' => true,
+ 'style' => true
+ )
)
- )
+ ),
+ 'style' => 'wp-block-comment-author-name'
),
'comment-content' => array(
'$schema' => 'https://schemas.wp.org/trunk/block.json',
@@ -917,6 +990,18 @@
'fontSize' => true
)
),
+ '__experimentalBorder' => array(
+ 'radius' => true,
+ 'color' => true,
+ 'width' => true,
+ 'style' => true,
+ '__experimentalDefaultControls' => array(
+ 'radius' => true,
+ 'color' => true,
+ 'width' => true,
+ 'style' => true
+ )
+ ),
'spacing' => array(
'padding' => array(
'horizontal',
@@ -927,7 +1012,8 @@
)
),
'html' => false
- )
+ ),
+ 'style' => 'wp-block-comment-content'
),
'comment-date' => array(
'$schema' => 'https://schemas.wp.org/trunk/block.json',
@@ -982,8 +1068,21 @@
),
'interactivity' => array(
'clientNavigation' => true
+ ),
+ '__experimentalBorder' => array(
+ 'radius' => true,
+ 'color' => true,
+ 'width' => true,
+ 'style' => true,
+ '__experimentalDefaultControls' => array(
+ 'radius' => true,
+ 'color' => true,
+ 'width' => true,
+ 'style' => true
+ )
)
- )
+ ),
+ 'style' => 'wp-block-comment-date'
),
'comment-edit-link' => array(
'$schema' => 'https://schemas.wp.org/trunk/block.json',
@@ -1021,7 +1120,11 @@
),
'spacing' => array(
'margin' => true,
- 'padding' => true
+ 'padding' => true,
+ '__experimentalDefaultControls' => array(
+ 'margin' => false,
+ 'padding' => false
+ )
),
'typography' => array(
'fontSize' => true,
@@ -1038,8 +1141,15 @@
),
'interactivity' => array(
'clientNavigation' => true
+ ),
+ '__experimentalBorder' => array(
+ 'radius' => true,
+ 'color' => true,
+ 'width' => true,
+ 'style' => true
)
- )
+ ),
+ 'style' => 'wp-block-comment-edit-link'
),
'comment-reply-link' => array(
'$schema' => 'https://schemas.wp.org/trunk/block.json',
@@ -1072,7 +1182,11 @@
),
'spacing' => array(
'margin' => true,
- 'padding' => true
+ 'padding' => true,
+ '__experimentalDefaultControls' => array(
+ 'margin' => false,
+ 'padding' => false
+ )
),
'typography' => array(
'fontSize' => true,
@@ -1087,8 +1201,15 @@
'fontSize' => true
)
),
+ '__experimentalBorder' => array(
+ 'radius' => true,
+ 'color' => true,
+ 'width' => true,
+ 'style' => true
+ ),
'html' => false
- )
+ ),
+ 'style' => 'wp-block-comment-reply-link'
),
'comment-template' => array(
'$schema' => 'https://schemas.wp.org/trunk/block.json',
@@ -1127,6 +1248,18 @@
),
'interactivity' => array(
'clientNavigation' => true
+ ),
+ '__experimentalBorder' => array(
+ 'radius' => true,
+ 'color' => true,
+ 'width' => true,
+ 'style' => true,
+ '__experimentalDefaultControls' => array(
+ 'radius' => true,
+ 'color' => true,
+ 'width' => true,
+ 'style' => true
+ )
)
),
'style' => 'wp-block-comment-template'
@@ -1422,6 +1555,9 @@
'level' => array(
'type' => 'number',
'default' => 2
+ ),
+ 'levelOptions' => array(
+ 'type' => 'array'
)
),
'supports' => array(
@@ -1773,6 +1909,10 @@
'id' => array(
'type' => 'number'
),
+ 'blob' => array(
+ 'type' => 'string',
+ '__experimentalRole' => 'local'
+ ),
'href' => array(
'type' => 'string'
),
@@ -1832,6 +1972,18 @@
'link' => true
)
),
+ '__experimentalBorder' => array(
+ 'radius' => true,
+ 'color' => true,
+ 'width' => true,
+ 'style' => true,
+ '__experimentalDefaultControls' => array(
+ 'radius' => true,
+ 'color' => true,
+ 'width' => true,
+ 'style' => true
+ )
+ ),
'interactivity' => true
),
'editorStyle' => 'wp-block-file-editor',
@@ -2052,6 +2204,16 @@
'supports' => array(
'anchor' => true,
'align' => true,
+ '__experimentalBorder' => array(
+ 'radius' => true,
+ 'color' => true,
+ 'width' => true,
+ 'style' => true,
+ '__experimentalDefaultControls' => array(
+ 'color' => true,
+ 'radius' => true
+ )
+ ),
'html' => false,
'units' => array(
'px',
@@ -2159,6 +2321,7 @@
'text' => true
)
),
+ 'shadow' => true,
'spacing' => array(
'margin' => array(
'top',
@@ -2238,6 +2401,9 @@
'type' => 'number',
'default' => 2
),
+ 'levelOptions' => array(
+ 'type' => 'array'
+ ),
'placeholder' => array(
'type' => 'string'
)
@@ -2250,6 +2416,18 @@
'anchor' => true,
'className' => true,
'splitting' => true,
+ '__experimentalBorder' => array(
+ 'color' => true,
+ 'radius' => true,
+ 'style' => true,
+ 'width' => true,
+ '__experimentalDefaultControls' => array(
+ 'color' => true,
+ 'radius' => true,
+ 'style' => true,
+ 'width' => true
+ )
+ ),
'color' => array(
'gradients' => true,
'link' => true,
@@ -2383,6 +2561,10 @@
),
'textdomain' => 'default',
'attributes' => array(
+ 'blob' => array(
+ 'type' => 'string',
+ '__experimentalRole' => 'local'
+ ),
'url' => array(
'type' => 'string',
'source' => 'attribute',
@@ -2482,6 +2664,9 @@
'filter' => array(
'duotone' => true
),
+ 'spacing' => array(
+ 'margin' => true
+ ),
'__experimentalBorder' => array(
'color' => true,
'radius' => true,
@@ -2551,6 +2736,15 @@
),
'supports' => array(
'align' => true,
+ 'color' => array(
+ 'gradients' => true,
+ 'link' => true,
+ '__experimentalDefaultControls' => array(
+ 'background' => true,
+ 'text' => true,
+ 'link' => true
+ )
+ ),
'html' => false,
'spacing' => array(
'margin' => true,
@@ -2740,7 +2934,7 @@
'allowedBlocks' => array(
'core/list-item'
),
- 'description' => 'Create a bulleted or numbered list.',
+ 'description' => 'An organized collection of items displayed in a specific order.',
'keywords' => array(
'bullet list',
'ordered list',
@@ -2781,6 +2975,12 @@
'supports' => array(
'anchor' => true,
'html' => false,
+ '__experimentalBorder' => array(
+ 'color' => true,
+ 'radius' => true,
+ 'style' => true,
+ 'width' => true
+ ),
'typography' => array(
'fontSize' => true,
'lineHeight' => true,
@@ -2817,6 +3017,9 @@
'clientNavigation' => true
)
),
+ 'selectors' => array(
+ 'border' => '.wp-block-list:not(.wp-block-list .wp-block-list)'
+ ),
'editorStyle' => 'wp-block-list-editor',
'style' => 'wp-block-list'
),
@@ -2832,7 +3035,7 @@
'allowedBlocks' => array(
'core/list'
),
- 'description' => 'Create a list item.',
+ 'description' => 'An individual item within a list.',
'textdomain' => 'default',
'attributes' => array(
'placeholder' => array(
@@ -2846,9 +3049,23 @@
)
),
'supports' => array(
+ 'anchor' => true,
'className' => false,
- '__experimentalSelector' => '.wp-block-list > li',
'splitting' => true,
+ '__experimentalBorder' => array(
+ 'color' => true,
+ 'radius' => true,
+ 'style' => true,
+ 'width' => true
+ ),
+ 'color' => array(
+ 'gradients' => true,
+ 'link' => true,
+ 'background' => true,
+ '__experimentalDefaultControls' => array(
+ 'text' => true
+ )
+ ),
'spacing' => array(
'margin' => true,
'padding' => true,
@@ -2873,6 +3090,10 @@
'interactivity' => array(
'clientNavigation' => true
)
+ ),
+ 'selectors' => array(
+ 'root' => '.wp-block-list > li',
+ 'border' => '.wp-block-list:not(.wp-block-list .wp-block-list) > li'
)
),
'loginout' => array(
@@ -2898,8 +3119,17 @@
'default' => true
)
),
+ 'example' => array(
+ 'viewportWidth' => 350
+ ),
'supports' => array(
'className' => true,
+ 'color' => array(
+ 'background' => true,
+ 'text' => false,
+ 'gradients' => true,
+ 'link' => true
+ ),
'spacing' => array(
'margin' => true,
'padding' => true,
@@ -2921,10 +3151,17 @@
'fontSize' => true
)
),
+ '__experimentalBorder' => array(
+ 'radius' => true,
+ 'color' => true,
+ 'width' => true,
+ 'style' => true
+ ),
'interactivity' => array(
'clientNavigation' => true
)
- )
+ ),
+ 'style' => 'wp-block-loginout'
),
'media-text' => array(
'$schema' => 'https://schemas.wp.org/trunk/block.json',
@@ -3040,6 +3277,18 @@
'full'
),
'html' => false,
+ '__experimentalBorder' => array(
+ 'color' => true,
+ 'radius' => true,
+ 'style' => true,
+ 'width' => true,
+ '__experimentalDefaultControls' => array(
+ 'color' => true,
+ 'radius' => true,
+ 'style' => true,
+ 'width' => true
+ )
+ ),
'color' => array(
'gradients' => true,
'heading' => true,
@@ -3456,6 +3705,19 @@
'supports' => array(
'reusable' => false,
'html' => false,
+ 'typography' => array(
+ 'fontSize' => true,
+ 'lineHeight' => true,
+ '__experimentalFontFamily' => true,
+ '__experimentalFontWeight' => true,
+ '__experimentalFontStyle' => true,
+ '__experimentalTextTransform' => true,
+ '__experimentalTextDecoration' => true,
+ '__experimentalLetterSpacing' => true,
+ '__experimentalDefaultControls' => array(
+ 'fontSize' => true
+ )
+ ),
'interactivity' => array(
'clientNavigation' => true
)
@@ -3652,9 +3914,15 @@
'splitting' => true,
'anchor' => true,
'className' => false,
- 'color' => array(
- 'gradients' => true,
- 'link' => true,
+ '__experimentalBorder' => array(
+ 'color' => true,
+ 'radius' => true,
+ 'style' => true,
+ 'width' => true
+ ),
+ 'color' => array(
+ 'gradients' => true,
+ 'link' => true,
'__experimentalDefaultControls' => array(
'background' => true,
'text' => true
@@ -3783,8 +4051,21 @@
),
'interactivity' => array(
'clientNavigation' => true
+ ),
+ '__experimentalBorder' => array(
+ 'radius' => true,
+ 'color' => true,
+ 'width' => true,
+ 'style' => true,
+ '__experimentalDefaultControls' => array(
+ 'radius' => true,
+ 'color' => true,
+ 'width' => true,
+ 'style' => true
+ )
)
),
+ 'editorStyle' => 'wp-block-post-author-editor',
'style' => 'wp-block-post-author'
),
'post-author-biography' => array(
@@ -3804,6 +4085,9 @@
'postType',
'postId'
),
+ 'example' => array(
+ 'viewportWidth' => 350
+ ),
'supports' => array(
'spacing' => array(
'margin' => true,
@@ -3832,8 +4116,21 @@
),
'interactivity' => array(
'clientNavigation' => true
+ ),
+ '__experimentalBorder' => array(
+ 'radius' => true,
+ 'color' => true,
+ 'width' => true,
+ 'style' => true,
+ '__experimentalDefaultControls' => array(
+ 'radius' => true,
+ 'color' => true,
+ 'width' => true,
+ 'style' => true
+ )
)
- )
+ ),
+ 'style' => 'wp-block-post-author-biography'
),
'post-author-name' => array(
'$schema' => 'https://schemas.wp.org/trunk/block.json',
@@ -3860,6 +4157,9 @@
'postType',
'postId'
),
+ 'example' => array(
+ 'viewportWidth' => 350
+ ),
'supports' => array(
'html' => false,
'spacing' => array(
@@ -3890,8 +4190,21 @@
),
'interactivity' => array(
'clientNavigation' => true
+ ),
+ '__experimentalBorder' => array(
+ 'radius' => true,
+ 'color' => true,
+ 'width' => true,
+ 'style' => true,
+ '__experimentalDefaultControls' => array(
+ 'radius' => true,
+ 'color' => true,
+ 'width' => true,
+ 'style' => true
+ )
)
- )
+ ),
+ 'style' => 'wp-block-post-author-name'
),
'post-comments-form' => array(
'$schema' => 'https://schemas.wp.org/trunk/block.json',
@@ -3935,6 +4248,18 @@
'__experimentalDefaultControls' => array(
'fontSize' => true
)
+ ),
+ '__experimentalBorder' => array(
+ 'radius' => true,
+ 'color' => true,
+ 'width' => true,
+ 'style' => true,
+ '__experimentalDefaultControls' => array(
+ 'radius' => true,
+ 'color' => true,
+ 'width' => true,
+ 'style' => true
+ )
)
),
'editorStyle' => 'wp-block-post-comments-form-editor',
@@ -3957,6 +4282,9 @@
'postType',
'queryId'
),
+ 'example' => array(
+ 'viewportWidth' => 350
+ ),
'supports' => array(
'align' => array(
'wide',
@@ -3964,11 +4292,23 @@
),
'html' => false,
'layout' => true,
+ 'background' => array(
+ 'backgroundImage' => true,
+ 'backgroundSize' => true,
+ '__experimentalDefaultControls' => array(
+ 'backgroundImage' => true
+ )
+ ),
'dimensions' => array(
'minHeight' => true
),
'spacing' => array(
- 'blockGap' => true
+ 'blockGap' => true,
+ 'padding' => true,
+ '__experimentalDefaultControls' => array(
+ 'margin' => false,
+ 'padding' => false
+ )
),
'color' => array(
'gradients' => true,
@@ -3992,6 +4332,7 @@
)
)
),
+ 'style' => 'wp-block-post-content',
'editorStyle' => 'wp-block-post-content-editor'
),
'post-date' => array(
@@ -4023,6 +4364,9 @@
'postType',
'queryId'
),
+ 'example' => array(
+ 'viewportWidth' => 350
+ ),
'supports' => array(
'html' => false,
'color' => array(
@@ -4053,6 +4397,18 @@
),
'interactivity' => array(
'clientNavigation' => true
+ ),
+ '__experimentalBorder' => array(
+ 'radius' => true,
+ 'color' => true,
+ 'width' => true,
+ 'style' => true,
+ '__experimentalDefaultControls' => array(
+ 'radius' => true,
+ 'color' => true,
+ 'width' => true,
+ 'style' => true
+ )
)
)
),
@@ -4085,6 +4441,9 @@
'postType',
'queryId'
),
+ 'example' => array(
+ 'viewportWidth' => 350
+ ),
'supports' => array(
'html' => false,
'color' => array(
@@ -4115,6 +4474,18 @@
),
'interactivity' => array(
'clientNavigation' => true
+ ),
+ '__experimentalBorder' => array(
+ 'radius' => true,
+ 'color' => true,
+ 'width' => true,
+ 'style' => true,
+ '__experimentalDefaultControls' => array(
+ 'radius' => true,
+ 'color' => true,
+ 'width' => true,
+ 'style' => true
+ )
)
),
'editorStyle' => 'wp-block-post-excerpt-editor',
@@ -4184,6 +4555,9 @@
'postType',
'queryId'
),
+ 'example' => array(
+ 'viewportWidth' => 350
+ ),
'supports' => array(
'align' => array(
'left',
@@ -4392,6 +4766,9 @@
'postId',
'postType'
),
+ 'example' => array(
+ 'viewportWidth' => 350
+ ),
'supports' => array(
'html' => false,
'color' => array(
@@ -4422,6 +4799,18 @@
),
'interactivity' => array(
'clientNavigation' => true
+ ),
+ '__experimentalBorder' => array(
+ 'radius' => true,
+ 'color' => true,
+ 'width' => true,
+ 'style' => true,
+ '__experimentalDefaultControls' => array(
+ 'radius' => true,
+ 'color' => true,
+ 'width' => true,
+ 'style' => true
+ )
)
),
'style' => 'wp-block-post-terms'
@@ -4447,6 +4836,9 @@
'type' => 'number',
'default' => 2
),
+ 'levelOptions' => array(
+ 'type' => 'array'
+ ),
'isLink' => array(
'type' => 'boolean',
'default' => false
@@ -4461,6 +4853,9 @@
'default' => '_self'
)
),
+ 'example' => array(
+ 'viewportWidth' => 350
+ ),
'supports' => array(
'align' => array(
'wide',
@@ -4495,6 +4890,18 @@
),
'interactivity' => array(
'clientNavigation' => true
+ ),
+ '__experimentalBorder' => array(
+ 'radius' => true,
+ 'color' => true,
+ 'width' => true,
+ 'style' => true,
+ '__experimentalDefaultControls' => array(
+ 'radius' => true,
+ 'color' => true,
+ 'width' => true,
+ 'style' => true
+ )
)
),
'style' => 'wp-block-post-title'
@@ -4544,6 +4951,18 @@
),
'interactivity' => array(
'clientNavigation' => true
+ ),
+ '__experimentalBorder' => array(
+ 'radius' => true,
+ 'color' => true,
+ 'width' => true,
+ 'style' => true,
+ '__experimentalDefaultControls' => array(
+ 'radius' => true,
+ 'color' => true,
+ 'width' => true,
+ 'style' => true
+ )
)
),
'style' => 'wp-block-preformatted'
@@ -4581,6 +5000,13 @@
'wide',
'full'
),
+ 'background' => array(
+ 'backgroundImage' => true,
+ 'backgroundSize' => true,
+ '__experimentalDefaultControls' => array(
+ 'backgroundImage' => true
+ )
+ ),
'color' => array(
'gradients' => true,
'background' => true,
@@ -4590,6 +5016,12 @@
'text' => true
)
),
+ 'dimensions' => array(
+ 'minHeight' => true,
+ '__experimentalDefaultControls' => array(
+ 'minHeight' => false
+ )
+ ),
'spacing' => array(
'margin' => true,
'padding' => true
@@ -4663,6 +5095,9 @@
'taxQuery' => null,
'parents' => array(
+ ),
+ 'format' => array(
+
)
)
),
@@ -4678,6 +5113,9 @@
'default' => false
)
),
+ 'usesContext' => array(
+ 'postType'
+ ),
'providesContext' => array(
'queryId' => 'queryId',
'query' => 'query',
@@ -4982,6 +5420,9 @@
'type' => 'number',
'default' => 1
),
+ 'levelOptions' => array(
+ 'type' => 'array'
+ ),
'showPrefix' => array(
'type' => 'boolean',
'default' => true
@@ -5023,6 +5464,18 @@
),
'interactivity' => array(
'clientNavigation' => true
+ ),
+ '__experimentalBorder' => array(
+ 'radius' => true,
+ 'color' => true,
+ 'width' => true,
+ 'style' => true,
+ '__experimentalDefaultControls' => array(
+ 'radius' => true,
+ 'color' => true,
+ 'width' => true,
+ 'style' => true
+ )
)
),
'style' => 'wp-block-query-title'
@@ -5060,7 +5513,38 @@
),
'supports' => array(
'anchor' => true,
+ 'align' => array(
+ 'left',
+ 'right',
+ 'wide',
+ 'full'
+ ),
'html' => false,
+ 'background' => array(
+ 'backgroundImage' => true,
+ 'backgroundSize' => true,
+ '__experimentalDefaultControls' => array(
+ 'backgroundImage' => true
+ )
+ ),
+ '__experimentalBorder' => array(
+ 'color' => true,
+ 'radius' => true,
+ 'style' => true,
+ 'width' => true,
+ '__experimentalDefaultControls' => array(
+ 'color' => true,
+ 'radius' => true,
+ 'style' => true,
+ 'width' => true
+ )
+ ),
+ 'dimensions' => array(
+ 'minHeight' => true,
+ '__experimentalDefaultControls' => array(
+ 'minHeight' => false
+ )
+ ),
'__experimentalOnEnter' => true,
'__experimentalOnMerge' => true,
'typography' => array(
@@ -5089,7 +5573,9 @@
'allowEditing' => false
),
'spacing' => array(
- 'blockGap' => true
+ 'blockGap' => true,
+ 'padding' => true,
+ 'margin' => true
),
'interactivity' => array(
'clientNavigation' => true
@@ -5324,6 +5810,9 @@
'width' => true
)
),
+ 'spacing' => array(
+ 'margin' => true
+ ),
'html' => false
),
'editorStyle' => 'wp-block-search-editor',
@@ -5498,10 +5987,25 @@
'level' => array(
'type' => 'number',
'default' => 0
+ ),
+ 'levelOptions' => array(
+ 'type' => 'array',
+ 'default' => array(
+ 0,
+ 1,
+ 2,
+ 3,
+ 4,
+ 5,
+ 6
+ )
)
),
'example' => array(
-
+ 'viewportWidth' => 350,
+ 'attributes' => array(
+ 'textAlign' => 'center'
+ )
),
'supports' => array(
'align' => array(
@@ -5533,15 +6037,23 @@
'__experimentalFontStyle' => true,
'__experimentalFontWeight' => true,
'__experimentalLetterSpacing' => true,
+ '__experimentalWritingMode' => true,
'__experimentalDefaultControls' => array(
'fontSize' => true
)
),
'interactivity' => array(
'clientNavigation' => true
+ ),
+ '__experimentalBorder' => array(
+ 'radius' => true,
+ 'color' => true,
+ 'width' => true,
+ 'style' => true
)
),
- 'editorStyle' => 'wp-block-site-tagline-editor'
+ 'editorStyle' => 'wp-block-site-tagline-editor',
+ 'style' => 'wp-block-site-tagline'
),
'site-title' => array(
'$schema' => 'https://schemas.wp.org/trunk/block.json',
@@ -5556,6 +6068,18 @@
'type' => 'number',
'default' => 1
),
+ 'levelOptions' => array(
+ 'type' => 'array',
+ 'default' => array(
+ 0,
+ 1,
+ 2,
+ 3,
+ 4,
+ 5,
+ 6
+ )
+ ),
'textAlign' => array(
'type' => 'string'
),
@@ -5603,12 +6127,19 @@
'__experimentalFontStyle' => true,
'__experimentalFontWeight' => true,
'__experimentalLetterSpacing' => true,
+ '__experimentalWritingMode' => true,
'__experimentalDefaultControls' => array(
'fontSize' => true
)
),
'interactivity' => array(
'clientNavigation' => true
+ ),
+ '__experimentalBorder' => array(
+ 'radius' => true,
+ 'color' => true,
+ 'width' => true,
+ 'style' => true
)
),
'editorStyle' => 'wp-block-site-title-editor',
@@ -5756,6 +6287,18 @@
),
'interactivity' => array(
'clientNavigation' => true
+ ),
+ '__experimentalBorder' => array(
+ 'radius' => true,
+ 'color' => true,
+ 'width' => true,
+ 'style' => true,
+ '__experimentalDefaultControls' => array(
+ 'radius' => true,
+ 'color' => true,
+ 'width' => true,
+ 'style' => true
+ )
)
),
'styles' => array(
@@ -6048,7 +6591,7 @@
'name' => 'core/tag-cloud',
'title' => 'Tag Cloud',
'category' => 'widgets',
- 'description' => 'A cloud of your most used tags.',
+ 'description' => 'A cloud of popular keywords, each sized by how often it appears.',
'textdomain' => 'default',
'attributes' => array(
'numberOfTags' => array(
@@ -6102,6 +6645,18 @@
),
'interactivity' => array(
'clientNavigation' => true
+ ),
+ '__experimentalBorder' => array(
+ 'radius' => true,
+ 'color' => true,
+ 'width' => true,
+ 'style' => true,
+ '__experimentalDefaultControls' => array(
+ 'radius' => true,
+ 'color' => true,
+ 'width' => true,
+ 'style' => true
+ )
)
),
'editorStyle' => 'wp-block-tag-cloud-editor'
@@ -6184,6 +6739,18 @@
),
'interactivity' => array(
'clientNavigation' => true
+ ),
+ '__experimentalBorder' => array(
+ 'radius' => true,
+ 'color' => true,
+ 'width' => true,
+ 'style' => true,
+ '__experimentalDefaultControls' => array(
+ 'radius' => true,
+ 'color' => true,
+ 'width' => true,
+ 'style' => true
+ )
)
)
),
@@ -6259,6 +6826,13 @@
),
'supports' => array(
'anchor' => true,
+ 'background' => array(
+ 'backgroundImage' => true,
+ 'backgroundSize' => true,
+ '__experimentalDefaultControls' => array(
+ 'backgroundImage' => true
+ )
+ ),
'color' => array(
'gradients' => true,
'link' => true,
@@ -6267,6 +6841,12 @@
'text' => true
)
),
+ 'dimensions' => array(
+ 'minHeight' => true,
+ '__experimentalDefaultControls' => array(
+ 'minHeight' => false
+ )
+ ),
'typography' => array(
'fontSize' => true,
'__experimentalFontFamily' => true,
@@ -6276,6 +6856,7 @@
'__experimentalLetterSpacing' => true,
'__experimentalTextTransform' => true,
'__experimentalTextDecoration' => true,
+ '__experimentalWritingMode' => true,
'__experimentalDefaultControls' => array(
'fontSize' => true
)
@@ -6361,6 +6942,10 @@
'attribute' => 'preload',
'default' => 'metadata'
),
+ 'blob' => array(
+ 'type' => 'string',
+ '__experimentalRole' => 'local'
+ ),
'src' => array(
'type' => 'string',
'source' => 'attribute',
diff --git a/src/wp-includes/blocks/button/block.json b/src/wp-includes/blocks/button/block.json
index 740f3e50f84ee..d0f90b93467c9 100644
--- a/src/wp-includes/blocks/button/block.json
+++ b/src/wp-includes/blocks/button/block.json
@@ -93,6 +93,7 @@
"__experimentalTextTransform": true,
"__experimentalTextDecoration": true,
"__experimentalLetterSpacing": true,
+ "__experimentalWritingMode": true,
"__experimentalDefaultControls": {
"fontSize": true
}
diff --git a/src/wp-includes/blocks/buttons/block.json b/src/wp-includes/blocks/buttons/block.json
index 015290a4c7cc5..bb4c370158ad5 100644
--- a/src/wp-includes/blocks/buttons/block.json
+++ b/src/wp-includes/blocks/buttons/block.json
@@ -13,8 +13,16 @@
"align": [ "wide", "full" ],
"html": false,
"__experimentalExposeControlsToChildren": true,
+ "color": {
+ "gradients": true,
+ "text": false,
+ "__experimentalDefaultControls": {
+ "background": true
+ }
+ },
"spacing": {
- "blockGap": true,
+ "blockGap": [ "horizontal", "vertical" ],
+ "padding": true,
"margin": [ "top", "bottom" ],
"__experimentalDefaultControls": {
"blockGap": true
@@ -33,6 +41,18 @@
"fontSize": true
}
},
+ "__experimentalBorder": {
+ "color": true,
+ "radius": true,
+ "style": true,
+ "width": true,
+ "__experimentalDefaultControls": {
+ "color": true,
+ "radius": true,
+ "style": true,
+ "width": true
+ }
+ },
"layout": {
"allowSwitching": false,
"allowInheriting": false,
diff --git a/src/wp-includes/blocks/categories.php b/src/wp-includes/blocks/categories.php
index 1a6e6f43b1d93..e15f662bdfbb9 100644
--- a/src/wp-includes/blocks/categories.php
+++ b/src/wp-includes/blocks/categories.php
@@ -9,20 +9,26 @@
* Renders the `core/categories` block on server.
*
* @since 5.0.0
+ * @since 6.7.0 Enable client-side rendering if enhancedPagination context is true.
*
- * @param array $attributes The block attributes.
+ * @param array $attributes The block attributes.
+ * @param string $content Block default content.
+ * @param WP_Block $block Block instance.
*
* @return string Returns the categories list/dropdown markup.
*/
-function render_block_core_categories( $attributes ) {
+function render_block_core_categories( $attributes, $content, $block ) {
static $block_id = 0;
++$block_id;
+ $taxonomy = get_taxonomy( $attributes['taxonomy'] );
+
$args = array(
'echo' => false,
'hierarchical' => ! empty( $attributes['showHierarchy'] ),
'orderby' => 'name',
'show_count' => ! empty( $attributes['showPostCounts'] ),
+ 'taxonomy' => $attributes['taxonomy'],
'title_li' => '',
'hide_empty' => empty( $attributes['showEmpty'] ),
);
@@ -33,10 +39,20 @@ function render_block_core_categories( $attributes ) {
if ( ! empty( $attributes['displayAsDropdown'] ) ) {
$id = 'wp-block-categories-' . $block_id;
$args['id'] = $id;
- $args['show_option_none'] = __( 'Select Category' );
- $wrapper_markup = '
' . __( 'Categories' ) . ' %2$s
';
- $items_markup = wp_dropdown_categories( $args );
- $type = 'dropdown';
+ $args['name'] = $taxonomy->query_var;
+ $args['value_field'] = 'slug';
+ $args['show_option_none'] = sprintf(
+ /* translators: %s: taxonomy's singular name */
+ __( 'Select %s' ),
+ $taxonomy->labels->singular_name
+ );
+
+ $show_label = empty( $attributes['showLabel'] ) ? ' screen-reader-text' : '';
+ $default_label = $taxonomy->label;
+ $label_text = ! empty( $attributes['label'] ) ? $attributes['label'] : $default_label;
+ $wrapper_markup = '
' . $label_text . ' %2$s
';
+ $items_markup = wp_dropdown_categories( $args );
+ $type = 'dropdown';
if ( ! is_admin() ) {
// Inject the dropdown script immediately after the select dropdown.
@@ -48,9 +64,19 @@ function render_block_core_categories( $attributes ) {
);
}
} else {
+ $args['show_option_none'] = $taxonomy->labels->no_terms;
+
$wrapper_markup = '
';
$items_markup = wp_list_categories( $args );
$type = 'list';
+
+ if ( ! empty( $block->context['enhancedPagination'] ) ) {
+ $p = new WP_HTML_Tag_Processor( $items_markup );
+ while ( $p->next_tag( 'a' ) ) {
+ $p->set_attribute( 'data-wp-on--click', 'core/query::actions.navigate' );
+ }
+ $items_markup = $p->get_updated_html();
+ }
}
$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => "wp-block-categories-{$type}" ) );
@@ -78,8 +104,8 @@ function build_dropdown_script_block_core_categories( $dropdown_id ) {
( function() {
var dropdown = document.getElementById( '' );
function onCatChange() {
- if ( dropdown.options[ dropdown.selectedIndex ].value > 0 ) {
- location.href = "/?cat=" + dropdown.options[ dropdown.selectedIndex ].value;
+ if ( dropdown.options[ dropdown.selectedIndex ].value !== -1 ) {
+ location.href = "/?" + dropdown.name + '=' + dropdown.options[ dropdown.selectedIndex ].value;
}
}
dropdown.onchange = onCatChange;
diff --git a/src/wp-includes/blocks/categories/block.json b/src/wp-includes/blocks/categories/block.json
index 820ac8945f50f..bfd8461f8eda4 100644
--- a/src/wp-includes/blocks/categories/block.json
+++ b/src/wp-includes/blocks/categories/block.json
@@ -2,11 +2,16 @@
"$schema": "https://schemas.wp.org/trunk/block.json",
"apiVersion": 3,
"name": "core/categories",
- "title": "Categories List",
+ "title": "Terms List",
"category": "widgets",
- "description": "Display a list of all categories.",
+ "description": "Display a list of all terms of a given taxonomy.",
+ "keywords": [ "categories" ],
"textdomain": "default",
"attributes": {
+ "taxonomy": {
+ "type": "string",
+ "default": "category"
+ },
"displayAsDropdown": {
"type": "boolean",
"default": false
@@ -26,8 +31,17 @@
"showEmpty": {
"type": "boolean",
"default": false
+ },
+ "label": {
+ "type": "string",
+ "__experimentalRole": "content"
+ },
+ "showLabel": {
+ "type": "boolean",
+ "default": true
}
},
+ "usesContext": [ "enhancedPagination" ],
"supports": {
"align": true,
"html": false,
@@ -54,6 +68,18 @@
},
"interactivity": {
"clientNavigation": true
+ },
+ "__experimentalBorder": {
+ "radius": true,
+ "color": true,
+ "width": true,
+ "style": true,
+ "__experimentalDefaultControls": {
+ "radius": true,
+ "color": true,
+ "width": true,
+ "style": true
+ }
}
},
"editorStyle": "wp-block-categories-editor",
diff --git a/src/wp-includes/blocks/column/block.json b/src/wp-includes/blocks/column/block.json
index 0857abb47ffdc..33bd528b35688 100644
--- a/src/wp-includes/blocks/column/block.json
+++ b/src/wp-includes/blocks/column/block.json
@@ -48,10 +48,12 @@
},
"__experimentalBorder": {
"color": true,
+ "radius": true,
"style": true,
"width": true,
"__experimentalDefaultControls": {
"color": true,
+ "radius": true,
"style": true,
"width": true
}
diff --git a/src/wp-includes/blocks/comment-author-name/block.json b/src/wp-includes/blocks/comment-author-name/block.json
index f3422faf0264d..1889d054c940e 100644
--- a/src/wp-includes/blocks/comment-author-name/block.json
+++ b/src/wp-includes/blocks/comment-author-name/block.json
@@ -51,6 +51,19 @@
},
"interactivity": {
"clientNavigation": true
+ },
+ "__experimentalBorder": {
+ "radius": true,
+ "color": true,
+ "width": true,
+ "style": true,
+ "__experimentalDefaultControls": {
+ "radius": true,
+ "color": true,
+ "width": true,
+ "style": true
+ }
}
- }
+ },
+ "style": "wp-block-comment-author-name"
}
diff --git a/src/wp-includes/blocks/comment-content/block.json b/src/wp-includes/blocks/comment-content/block.json
index 9ac4b5453365b..0e812299a45e8 100644
--- a/src/wp-includes/blocks/comment-content/block.json
+++ b/src/wp-includes/blocks/comment-content/block.json
@@ -35,6 +35,18 @@
"fontSize": true
}
},
+ "__experimentalBorder": {
+ "radius": true,
+ "color": true,
+ "width": true,
+ "style": true,
+ "__experimentalDefaultControls": {
+ "radius": true,
+ "color": true,
+ "width": true,
+ "style": true
+ }
+ },
"spacing": {
"padding": [ "horizontal", "vertical" ],
"__experimentalDefaultControls": {
@@ -42,5 +54,6 @@
}
},
"html": false
- }
+ },
+ "style": "wp-block-comment-content"
}
diff --git a/src/wp-includes/blocks/comment-date.php b/src/wp-includes/blocks/comment-date.php
index f5876bb237b67..bdb6fd5ba42ae 100644
--- a/src/wp-includes/blocks/comment-date.php
+++ b/src/wp-includes/blocks/comment-date.php
@@ -28,11 +28,13 @@ function render_block_core_comment_date( $attributes, $content, $block ) {
$classes = ( isset( $attributes['style']['elements']['link']['color']['text'] ) ) ? 'has-link-color' : '';
$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classes ) );
- $formatted_date = get_comment_date(
- isset( $attributes['format'] ) ? $attributes['format'] : '',
- $comment
- );
- $link = get_comment_link( $comment );
+ if ( isset( $attributes['format'] ) && 'human-diff' === $attributes['format'] ) {
+ // translators: %s: human-readable time difference.
+ $formatted_date = sprintf( __( '%s ago' ), human_time_diff( get_comment_date( 'U', $comment ) ) );
+ } else {
+ $formatted_date = get_comment_date( empty( $attributes['format'] ) ? '' : $attributes['format'], $comment );
+ }
+ $link = get_comment_link( $comment );
if ( ! empty( $attributes['isLink'] ) ) {
$formatted_date = sprintf( '
%2s ', esc_url( $link ), $formatted_date );
diff --git a/src/wp-includes/blocks/comment-date/block.json b/src/wp-includes/blocks/comment-date/block.json
index ddc0281e6c668..1e8110f836d93 100644
--- a/src/wp-includes/blocks/comment-date/block.json
+++ b/src/wp-includes/blocks/comment-date/block.json
@@ -47,6 +47,19 @@
},
"interactivity": {
"clientNavigation": true
+ },
+ "__experimentalBorder": {
+ "radius": true,
+ "color": true,
+ "width": true,
+ "style": true,
+ "__experimentalDefaultControls": {
+ "radius": true,
+ "color": true,
+ "width": true,
+ "style": true
+ }
}
- }
+ },
+ "style": "wp-block-comment-date"
}
diff --git a/src/wp-includes/blocks/comment-edit-link/block.json b/src/wp-includes/blocks/comment-edit-link/block.json
index a49f9a23161b8..578b284715c2a 100644
--- a/src/wp-includes/blocks/comment-edit-link/block.json
+++ b/src/wp-includes/blocks/comment-edit-link/block.json
@@ -30,7 +30,11 @@
},
"spacing": {
"margin": true,
- "padding": true
+ "padding": true,
+ "__experimentalDefaultControls": {
+ "margin": false,
+ "padding": false
+ }
},
"typography": {
"fontSize": true,
@@ -47,6 +51,13 @@
},
"interactivity": {
"clientNavigation": true
+ },
+ "__experimentalBorder": {
+ "radius": true,
+ "color": true,
+ "width": true,
+ "style": true
}
- }
+ },
+ "style": "wp-block-comment-edit-link"
}
diff --git a/src/wp-includes/blocks/comment-reply-link/block.json b/src/wp-includes/blocks/comment-reply-link/block.json
index c10129412145c..68aa93c3c1526 100644
--- a/src/wp-includes/blocks/comment-reply-link/block.json
+++ b/src/wp-includes/blocks/comment-reply-link/block.json
@@ -25,7 +25,11 @@
},
"spacing": {
"margin": true,
- "padding": true
+ "padding": true,
+ "__experimentalDefaultControls": {
+ "margin": false,
+ "padding": false
+ }
},
"typography": {
"fontSize": true,
@@ -40,6 +44,13 @@
"fontSize": true
}
},
+ "__experimentalBorder": {
+ "radius": true,
+ "color": true,
+ "width": true,
+ "style": true
+ },
"html": false
- }
+ },
+ "style": "wp-block-comment-reply-link"
}
diff --git a/src/wp-includes/blocks/comment-template/block.json b/src/wp-includes/blocks/comment-template/block.json
index 70238c45a3d92..08fd591b42409 100644
--- a/src/wp-includes/blocks/comment-template/block.json
+++ b/src/wp-includes/blocks/comment-template/block.json
@@ -31,6 +31,18 @@
},
"interactivity": {
"clientNavigation": true
+ },
+ "__experimentalBorder": {
+ "radius": true,
+ "color": true,
+ "width": true,
+ "style": true,
+ "__experimentalDefaultControls": {
+ "radius": true,
+ "color": true,
+ "width": true,
+ "style": true
+ }
}
},
"style": "wp-block-comment-template"
diff --git a/src/wp-includes/blocks/comments-pagination-next.php b/src/wp-includes/blocks/comments-pagination-next.php
index cb8350e561b6e..0fd9519a56d30 100644
--- a/src/wp-includes/blocks/comments-pagination-next.php
+++ b/src/wp-includes/blocks/comments-pagination-next.php
@@ -37,7 +37,7 @@ function render_block_core_comments_pagination_next( $attributes, $content, $blo
$label .= $pagination_arrow;
}
- $next_comments_link = get_next_comments_link( $label, $max_page );
+ $next_comments_link = get_next_comments_link( $label, $max_page, $comment_vars['paged'] ?? null );
remove_filter( 'next_posts_link_attributes', $filter_link_attributes );
diff --git a/src/wp-includes/blocks/comments-pagination-previous.php b/src/wp-includes/blocks/comments-pagination-previous.php
index 092a28da67792..ba9bef97ad34d 100644
--- a/src/wp-includes/blocks/comments-pagination-previous.php
+++ b/src/wp-includes/blocks/comments-pagination-previous.php
@@ -29,7 +29,8 @@ function render_block_core_comments_pagination_previous( $attributes, $content,
};
add_filter( 'previous_comments_link_attributes', $filter_link_attributes );
- $previous_comments_link = get_previous_comments_link( $label );
+ $comment_vars = build_comment_query_vars_from_block( $block );
+ $previous_comments_link = get_previous_comments_link( $label, $comment_vars['paged'] ?? null );
remove_filter( 'previous_comments_link_attributes', $filter_link_attributes );
diff --git a/src/wp-includes/blocks/comments-title/block.json b/src/wp-includes/blocks/comments-title/block.json
index f8a02f2e5089b..b66b741e1916a 100644
--- a/src/wp-includes/blocks/comments-title/block.json
+++ b/src/wp-includes/blocks/comments-title/block.json
@@ -23,6 +23,9 @@
"level": {
"type": "number",
"default": 2
+ },
+ "levelOptions": {
+ "type": "array"
}
},
"supports": {
diff --git a/src/wp-includes/blocks/file.php b/src/wp-includes/blocks/file.php
index 87910f0e66a0c..8ea668d56d854 100644
--- a/src/wp-includes/blocks/file.php
+++ b/src/wp-includes/blocks/file.php
@@ -19,18 +19,7 @@
function render_block_core_file( $attributes, $content ) {
// If it's interactive, enqueue the script module and add the directives.
if ( ! empty( $attributes['displayPreview'] ) ) {
- $suffix = wp_scripts_get_suffix();
- if ( defined( 'IS_GUTENBERG_PLUGIN' ) && IS_GUTENBERG_PLUGIN ) {
- $module_url = gutenberg_url( '/build/interactivity/file.min.js' );
- }
-
- wp_register_script_module(
- '@wordpress/block-library/file',
- isset( $module_url ) ? $module_url : includes_url( "blocks/file/view{$suffix}.js" ),
- array( '@wordpress/interactivity' ),
- defined( 'GUTENBERG_VERSION' ) ? GUTENBERG_VERSION : get_bloginfo( 'version' )
- );
- wp_enqueue_script_module( '@wordpress/block-library/file' );
+ wp_enqueue_script_module( '@wordpress/block-library/file/view' );
$processor = new WP_HTML_Tag_Processor( $content );
$processor->next_tag();
diff --git a/src/wp-includes/blocks/file/block.json b/src/wp-includes/blocks/file/block.json
index fd5da67d284f4..0526120c4dfc1 100644
--- a/src/wp-includes/blocks/file/block.json
+++ b/src/wp-includes/blocks/file/block.json
@@ -11,6 +11,10 @@
"id": {
"type": "number"
},
+ "blob": {
+ "type": "string",
+ "__experimentalRole": "local"
+ },
"href": {
"type": "string"
},
@@ -70,6 +74,18 @@
"link": true
}
},
+ "__experimentalBorder": {
+ "radius": true,
+ "color": true,
+ "width": true,
+ "style": true,
+ "__experimentalDefaultControls": {
+ "radius": true,
+ "color": true,
+ "width": true,
+ "style": true
+ }
+ },
"interactivity": true
},
"editorStyle": "wp-block-file-editor",
diff --git a/src/wp-includes/blocks/gallery/block.json b/src/wp-includes/blocks/gallery/block.json
index e9018704bf6bf..6a2129ec1e056 100644
--- a/src/wp-includes/blocks/gallery/block.json
+++ b/src/wp-includes/blocks/gallery/block.json
@@ -112,6 +112,16 @@
"supports": {
"anchor": true,
"align": true,
+ "__experimentalBorder": {
+ "radius": true,
+ "color": true,
+ "width": true,
+ "style": true,
+ "__experimentalDefaultControls": {
+ "color": true,
+ "radius": true
+ }
+ },
"html": false,
"units": [ "px", "em", "rem", "vh", "vw" ],
"spacing": {
diff --git a/src/wp-includes/blocks/group/block.json b/src/wp-includes/blocks/group/block.json
index db7d09c55d2c0..3c7d8d3ce1310 100644
--- a/src/wp-includes/blocks/group/block.json
+++ b/src/wp-includes/blocks/group/block.json
@@ -45,6 +45,7 @@
"text": true
}
},
+ "shadow": true,
"spacing": {
"margin": [ "top", "bottom" ],
"padding": true,
diff --git a/src/wp-includes/blocks/heading/block.json b/src/wp-includes/blocks/heading/block.json
index 39e985038c323..6e43a18cfba45 100644
--- a/src/wp-includes/blocks/heading/block.json
+++ b/src/wp-includes/blocks/heading/block.json
@@ -21,6 +21,9 @@
"type": "number",
"default": 2
},
+ "levelOptions": {
+ "type": "array"
+ },
"placeholder": {
"type": "string"
}
@@ -30,6 +33,18 @@
"anchor": true,
"className": true,
"splitting": true,
+ "__experimentalBorder": {
+ "color": true,
+ "radius": true,
+ "style": true,
+ "width": true,
+ "__experimentalDefaultControls": {
+ "color": true,
+ "radius": true,
+ "style": true,
+ "width": true
+ }
+ },
"color": {
"gradients": true,
"link": true,
diff --git a/src/wp-includes/blocks/image.php b/src/wp-includes/blocks/image.php
index 584318b51d196..5d7815a1f2f3f 100644
--- a/src/wp-includes/blocks/image.php
+++ b/src/wp-includes/blocks/image.php
@@ -70,19 +70,7 @@ function render_block_core_image( $attributes, $content, $block ) {
isset( $lightbox_settings['enabled'] ) &&
true === $lightbox_settings['enabled']
) {
- $suffix = wp_scripts_get_suffix();
- if ( defined( 'IS_GUTENBERG_PLUGIN' ) && IS_GUTENBERG_PLUGIN ) {
- $module_url = gutenberg_url( '/build/interactivity/image.min.js' );
- }
-
- wp_register_script_module(
- '@wordpress/block-library/image',
- isset( $module_url ) ? $module_url : includes_url( "blocks/image/view{$suffix}.js" ),
- array( '@wordpress/interactivity' ),
- defined( 'GUTENBERG_VERSION' ) ? GUTENBERG_VERSION : get_bloginfo( 'version' )
- );
-
- wp_enqueue_script_module( '@wordpress/block-library/image' );
+ wp_enqueue_script_module( '@wordpress/block-library/image/view' );
/*
* This render needs to happen in a filter with priority 15 to ensure that
@@ -185,22 +173,37 @@ function block_core_image_render_lightbox( $block_content, $block ) {
$p->seek( 'figure' );
$figure_class_names = $p->get_attribute( 'class' );
$figure_styles = $p->get_attribute( 'style' );
+
+ // Create unique id and set the image metadata in the state.
+ $unique_image_id = uniqid();
+
+ wp_interactivity_state(
+ 'core/image',
+ array(
+ 'metadata' => array(
+ $unique_image_id => array(
+ 'uploadedSrc' => $img_uploaded_src,
+ 'figureClassNames' => $figure_class_names,
+ 'figureStyles' => $figure_styles,
+ 'imgClassNames' => $img_class_names,
+ 'imgStyles' => $img_styles,
+ 'targetWidth' => $img_width,
+ 'targetHeight' => $img_height,
+ 'scaleAttr' => $block['attrs']['scale'] ?? false,
+ 'ariaLabel' => $aria_label,
+ 'alt' => $alt,
+ ),
+ ),
+ )
+ );
+
$p->add_class( 'wp-lightbox-container' );
$p->set_attribute( 'data-wp-interactive', 'core/image' );
$p->set_attribute(
'data-wp-context',
wp_json_encode(
array(
- 'uploadedSrc' => $img_uploaded_src,
- 'figureClassNames' => $figure_class_names,
- 'figureStyles' => $figure_styles,
- 'imgClassNames' => $img_class_names,
- 'imgStyles' => $img_styles,
- 'targetWidth' => $img_width,
- 'targetHeight' => $img_height,
- 'scaleAttr' => $block['attrs']['scale'] ?? false,
- 'ariaLabel' => $aria_label,
- 'alt' => $alt,
+ 'imageId' => $unique_image_id,
),
JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_AMP
)
@@ -215,6 +218,8 @@ function block_core_image_render_lightbox( $block_content, $block ) {
// contain a caption, and we don't want to trigger the lightbox when the
// caption is clicked.
$p->set_attribute( 'data-wp-on-async--click', 'actions.showLightbox' );
+ $p->set_attribute( 'data-wp-class--hide', 'state.isContentHidden' );
+ $p->set_attribute( 'data-wp-class--show', 'state.isContentVisible' );
$body_content = $p->get_updated_html();
@@ -231,8 +236,8 @@ class="lightbox-trigger"
aria-label="' . esc_attr( $aria_label ) . '"
data-wp-init="callbacks.initTriggerButton"
data-wp-on-async--click="actions.showLightbox"
- data-wp-style--right="context.imageButtonRight"
- data-wp-style--top="context.imageButtonTop"
+ data-wp-style--right="state.imageButtonRight"
+ data-wp-style--top="state.imageButtonTop"
>
-
-
+
-
+
)/',
- '$1' . $image_tag,
- $content
- );
+ // Add the image tag inside the figure tag, and update the image attributes
+ // in order to display the featured image.
+ $media_size_slug = isset( $attributes['mediaSizeSlug'] ) ? $attributes['mediaSizeSlug'] : 'full';
+ $image_tag = ')/',
+ '$1' . $image_tag,
+ $content
+ );
- $image_tag_processor = new WP_HTML_Tag_Processor( $content );
+ $image_tag_processor = new WP_HTML_Tag_Processor( $content );
+ if ( $image_tag_processor->next_tag(
+ array(
+ 'tag_name' => 'figure',
+ 'id' => $unique_id,
+ )
+ ) ) {
+ // The ID is only used to ensure that the correct figure tag is selected,
+ // and can now be removed.
+ $image_tag_processor->remove_attribute( 'id' );
if ( $image_tag_processor->next_tag(
array(
- 'tag_name' => 'figure',
- 'id' => $unique_id,
+ 'tag_name' => 'img',
+ 'class_name' => 'wp-block-media-text__featured_image',
)
) ) {
- // The ID is only used to ensure that the correct figure tag is selected,
- // and can now be removed.
- $image_tag_processor->remove_attribute( 'id' );
- if ( $image_tag_processor->next_tag(
- array(
- 'tag_name' => 'img',
- 'class_name' => 'wp-block-media-text__featured_image',
- )
- ) ) {
- $image_tag_processor->set_attribute( 'src', esc_url( $current_featured_image ) );
- $image_tag_processor->set_attribute( 'class', 'wp-image-' . get_post_thumbnail_id() . ' size-' . $media_size_slug );
- $image_tag_processor->set_attribute( 'alt', trim( strip_tags( get_post_meta( get_post_thumbnail_id(), '_wp_attachment_image_alt', true ) ) ) );
-
- $content = $image_tag_processor->get_updated_html();
+ $image_tag_processor->set_attribute( 'src', esc_url( $current_featured_image ) );
+ $image_tag_processor->set_attribute( 'class', 'wp-image-' . get_post_thumbnail_id() . ' size-' . $media_size_slug );
+ $image_tag_processor->set_attribute( 'alt', trim( strip_tags( get_post_meta( get_post_thumbnail_id(), '_wp_attachment_image_alt', true ) ) ) );
+ if ( $image_fill ) {
+ $image_tag_processor->set_attribute( 'style', 'object-position:' . $focal_point . ';' );
}
+
+ $content = $image_tag_processor->get_updated_html();
}
}
diff --git a/src/wp-includes/blocks/media-text/block.json b/src/wp-includes/blocks/media-text/block.json
index 0f3519acb5d53..42384c0c4478e 100644
--- a/src/wp-includes/blocks/media-text/block.json
+++ b/src/wp-includes/blocks/media-text/block.json
@@ -103,6 +103,18 @@
"anchor": true,
"align": [ "wide", "full" ],
"html": false,
+ "__experimentalBorder": {
+ "color": true,
+ "radius": true,
+ "style": true,
+ "width": true,
+ "__experimentalDefaultControls": {
+ "color": true,
+ "radius": true,
+ "style": true,
+ "width": true
+ }
+ },
"color": {
"gradients": true,
"heading": true,
diff --git a/src/wp-includes/blocks/navigation-submenu/block.json b/src/wp-includes/blocks/navigation-submenu/block.json
index 0bcf8a1a47f38..e767b60aec3a6 100644
--- a/src/wp-includes/blocks/navigation-submenu/block.json
+++ b/src/wp-includes/blocks/navigation-submenu/block.json
@@ -59,6 +59,19 @@
"supports": {
"reusable": false,
"html": false,
+ "typography": {
+ "fontSize": true,
+ "lineHeight": true,
+ "__experimentalFontFamily": true,
+ "__experimentalFontWeight": true,
+ "__experimentalFontStyle": true,
+ "__experimentalTextTransform": true,
+ "__experimentalTextDecoration": true,
+ "__experimentalLetterSpacing": true,
+ "__experimentalDefaultControls": {
+ "fontSize": true
+ }
+ },
"interactivity": {
"clientNavigation": true
}
diff --git a/src/wp-includes/blocks/navigation.php b/src/wp-includes/blocks/navigation.php
index 99feef98542ed..10fec84ed59d9 100644
--- a/src/wp-includes/blocks/navigation.php
+++ b/src/wp-includes/blocks/navigation.php
@@ -241,13 +241,11 @@ private static function get_inner_blocks_from_navigation_post( $attributes ) {
// it encounters whitespace. This code strips it.
$blocks = block_core_navigation_filter_out_empty_blocks( $parsed_blocks );
- if ( function_exists( 'set_ignored_hooked_blocks_metadata' ) ) {
- // Run Block Hooks algorithm to inject hooked blocks.
- $markup = block_core_navigation_insert_hooked_blocks( $blocks, $navigation_post );
- $root_nav_block = parse_blocks( $markup )[0];
+ // Run Block Hooks algorithm to inject hooked blocks.
+ $markup = block_core_navigation_insert_hooked_blocks( $blocks, $navigation_post );
+ $root_nav_block = parse_blocks( $markup )[0];
- $blocks = isset( $root_nav_block['innerBlocks'] ) ? $root_nav_block['innerBlocks'] : $blocks;
- }
+ $blocks = isset( $root_nav_block['innerBlocks'] ) ? $root_nav_block['innerBlocks'] : $blocks;
// TODO - this uses the full navigation block attributes for the
// context which could be refined.
@@ -483,7 +481,7 @@ private static function get_responsive_container_markup( $attributes, $inner_blo
}
}
$toggle_button_content = $should_display_icon_label ? $toggle_button_icon : __( 'Menu' );
- $toggle_close_button_icon = ' in 2004-2006 and placed in
# the public domain. Revised in subsequent years, still public domain.
@@ -51,15 +51,17 @@ function __construct($iteration_count_log2, $portable_hashes)
{
$this->itoa64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
- if ($iteration_count_log2 < 4 || $iteration_count_log2 > 31)
+ if ($iteration_count_log2 < 4 || $iteration_count_log2 > 31) {
$iteration_count_log2 = 8;
+ }
$this->iteration_count_log2 = $iteration_count_log2;
$this->portable_hashes = $portable_hashes;
$this->random_state = microtime();
- if (function_exists('getmypid'))
+ if (function_exists('getmypid')) {
$this->random_state .= getmypid();
+ }
}
function PasswordHash($iteration_count_log2, $portable_hashes)
@@ -96,16 +98,20 @@ function encode64($input, $count)
do {
$value = ord($input[$i++]);
$output .= $this->itoa64[$value & 0x3f];
- if ($i < $count)
+ if ($i < $count) {
$value |= ord($input[$i]) << 8;
+ }
$output .= $this->itoa64[($value >> 6) & 0x3f];
- if ($i++ >= $count)
+ if ($i++ >= $count) {
break;
- if ($i < $count)
+ }
+ if ($i < $count) {
$value |= ord($input[$i]) << 16;
+ }
$output .= $this->itoa64[($value >> 12) & 0x3f];
- if ($i++ >= $count)
+ if ($i++ >= $count) {
break;
+ }
$output .= $this->itoa64[($value >> 18) & 0x3f];
} while ($i < $count);
@@ -115,8 +121,8 @@ function encode64($input, $count)
function gensalt_private($input)
{
$output = '$P$';
- $output .= $this->itoa64[min($this->iteration_count_log2 +
- ((PHP_VERSION >= '5') ? 5 : 3), 30)];
+ $output .= $this->itoa64[min($this->iteration_count_log2 + 5,
+ 30)];
$output .= $this->encode64($input, 6);
return $output;
@@ -125,23 +131,27 @@ function gensalt_private($input)
function crypt_private($password, $setting)
{
$output = '*0';
- if (substr($setting, 0, 2) === $output)
+ if (substr($setting, 0, 2) === $output) {
$output = '*1';
+ }
$id = substr($setting, 0, 3);
# We use "$P$", phpBB3 uses "$H$" for the same thing
- if ($id !== '$P$' && $id !== '$H$')
+ if ($id !== '$P$' && $id !== '$H$') {
return $output;
+ }
$count_log2 = strpos($this->itoa64, $setting[3]);
- if ($count_log2 < 7 || $count_log2 > 30)
+ if ($count_log2 < 7 || $count_log2 > 30) {
return $output;
+ }
$count = 1 << $count_log2;
$salt = substr($setting, 4, 8);
- if (strlen($salt) !== 8)
+ if (strlen($salt) !== 8) {
return $output;
+ }
# We were kind of forced to use MD5 here since it's the only
# cryptographic primitive that was available in all versions
@@ -174,7 +184,7 @@ function gensalt_blowfish($input)
$output = '$2a$';
$output .= chr((int)(ord('0') + $this->iteration_count_log2 / 10));
- $output .= chr((ord('0') + $this->iteration_count_log2 % 10));
+ $output .= chr(ord('0') + $this->iteration_count_log2 % 10);
$output .= '$';
$i = 0;
@@ -213,17 +223,20 @@ function HashPassword($password)
$random = $this->get_random_bytes(16);
$hash =
crypt($password, $this->gensalt_blowfish($random));
- if (strlen($hash) === 60)
+ if (strlen($hash) === 60) {
return $hash;
+ }
}
- if (strlen($random) < 6)
+ if (strlen($random) < 6) {
$random = $this->get_random_bytes(6);
+ }
$hash =
$this->crypt_private($password,
$this->gensalt_private($random));
- if (strlen($hash) === 34)
+ if (strlen($hash) === 34) {
return $hash;
+ }
# Returning '*' on error is safe here, but would _not_ be safe
# in a crypt(3)-like function used _both_ for generating new
@@ -238,8 +251,9 @@ function CheckPassword($password, $stored_hash)
}
$hash = $this->crypt_private($password, $stored_hash);
- if ($hash[0] === '*')
+ if ($hash[0] === '*') {
$hash = crypt($password, $stored_hash);
+ }
# This is not constant-time. In order to keep the code simple,
# for timing safety we currently rely on the salts being
diff --git a/src/wp-includes/class-pop3.php b/src/wp-includes/class-pop3.php
index 7a72b1caf81a0..b4eab75044169 100644
--- a/src/wp-includes/class-pop3.php
+++ b/src/wp-includes/class-pop3.php
@@ -60,6 +60,7 @@ function __construct ( $server = '', $timeout = '' ) {
settype($timeout,"integer");
$this->TIMEOUT = $timeout;
if(function_exists("set_time_limit")){
+ // Extends POP3 request timeout to specified TIMEOUT property.
set_time_limit($timeout);
}
}
@@ -75,6 +76,7 @@ public function POP3( $server = '', $timeout = '' ) {
function update_timer () {
if(function_exists("set_time_limit")){
+ // Allows additional extension of POP3 request timeout to specified TIMEOUT property when update_timer is called.
set_time_limit($this->TIMEOUT);
}
return true;
diff --git a/src/wp-includes/class-wp-application-passwords.php b/src/wp-includes/class-wp-application-passwords.php
index 38ec4915dea48..b76b5c7e2a5ae 100644
--- a/src/wp-includes/class-wp-application-passwords.php
+++ b/src/wp-includes/class-wp-application-passwords.php
@@ -94,10 +94,6 @@ public static function create_new_application_password( $user_id, $args = array(
return new WP_Error( 'application_password_empty_name', __( 'An application name is required to create an application password.' ), array( 'status' => 400 ) );
}
- if ( self::application_name_exists_for_user( $user_id, $args['name'] ) ) {
- return new WP_Error( 'application_password_duplicate_name', __( 'Each application name should be unique.' ), array( 'status' => 409 ) );
- }
-
$new_password = wp_generate_password( static::PW_LENGTH, false );
$hashed_password = wp_hash_password( $new_password );
diff --git a/src/wp-includes/class-wp-block-bindings-registry.php b/src/wp-includes/class-wp-block-bindings-registry.php
index 14c1b89229c30..dc065356c5ce4 100644
--- a/src/wp-includes/class-wp-block-bindings-registry.php
+++ b/src/wp-includes/class-wp-block-bindings-registry.php
@@ -189,20 +189,6 @@ public function register( string $source_name, array $source_properties ) {
$this->sources[ $source_name ] = $source;
- // Adds `uses_context` defined by block bindings sources.
- add_filter(
- 'get_block_type_uses_context',
- function ( $uses_context, $block_type ) use ( $source ) {
- if ( ! in_array( $block_type->name, $this->supported_blocks, true ) || empty( $source->uses_context ) ) {
- return $uses_context;
- }
- // Use array_values to reset the array keys.
- return array_values( array_unique( array_merge( $uses_context, $source->uses_context ) ) );
- },
- 10,
- 2
- );
-
return $source;
}
diff --git a/src/wp-includes/class-wp-block-parser-frame.php b/src/wp-includes/class-wp-block-parser-frame.php
index 15938dea389aa..6ab5dd3087dfb 100644
--- a/src/wp-includes/class-wp-block-parser-frame.php
+++ b/src/wp-includes/class-wp-block-parser-frame.php
@@ -65,8 +65,9 @@ class WP_Block_Parser_Frame {
* @param WP_Block_Parser_Block $block Full or partial block.
* @param int $token_start Byte offset into document for start of parse token.
* @param int $token_length Byte length of entire parse token string.
- * @param int $prev_offset Byte offset into document for after parse token ends.
- * @param int $leading_html_start Byte offset into document where leading HTML before token starts.
+ * @param int|null $prev_offset Optional. Byte offset into document for after parse token ends. Default null.
+ * @param int|null $leading_html_start Optional. Byte offset into document where leading HTML before token starts.
+ * Default null.
*/
public function __construct( $block, $token_start, $token_length, $prev_offset = null, $leading_html_start = null ) {
$this->block = $block;
diff --git a/src/wp-includes/class-wp-block-supports.php b/src/wp-includes/class-wp-block-supports.php
index c90b5e0c54c59..71d6b4969145c 100644
--- a/src/wp-includes/class-wp-block-supports.php
+++ b/src/wp-includes/class-wp-block-supports.php
@@ -104,7 +104,7 @@ public function apply_block_supports() {
}
$block_attributes = array_key_exists( 'attrs', self::$block_to_render ) && is_array( self::$block_to_render['attrs'] )
- ? self::$block_to_render['attrs']
+ ? $block_type->prepare_attributes_for_render( self::$block_to_render['attrs'] )
: array();
$output = array();
diff --git a/src/wp-includes/class-wp-block-template.php b/src/wp-includes/class-wp-block-template.php
index 8149935203220..822302d4c4d85 100644
--- a/src/wp-includes/class-wp-block-template.php
+++ b/src/wp-includes/class-wp-block-template.php
@@ -131,6 +131,14 @@ class WP_Block_Template {
*/
public $author;
+ /**
+ * Plugin.
+ *
+ * @since 6.7.0
+ * @var string|null
+ */
+ public $plugin;
+
/**
* Post types.
*
diff --git a/src/wp-includes/class-wp-block-templates-registry.php b/src/wp-includes/class-wp-block-templates-registry.php
new file mode 100644
index 0000000000000..368c517fc9e27
--- /dev/null
+++ b/src/wp-includes/class-wp-block-templates-registry.php
@@ -0,0 +1,256 @@
+ $instance` pairs.
+ *
+ * @since 6.7.0
+ * @var WP_Block_Template[] $registered_block_templates Registered templates.
+ */
+ private $registered_templates = array();
+
+ /**
+ * Container for the main instance of the class.
+ *
+ * @since 6.7.0
+ * @var WP_Block_Templates_Registry|null
+ */
+ private static $instance = null;
+
+ /**
+ * Registers a template.
+ *
+ * @since 6.7.0
+ *
+ * @param string $template_name Template name including namespace.
+ * @param array $args Optional. Array of template arguments.
+ * @return WP_Block_Template|WP_Error The registered template on success, or WP_Error on failure.
+ */
+ public function register( $template_name, $args = array() ) {
+
+ $template = null;
+
+ $error_message = '';
+ $error_code = '';
+
+ if ( ! is_string( $template_name ) ) {
+ $error_message = __( 'Template names must be strings.' );
+ $error_code = 'template_name_no_string';
+ } elseif ( preg_match( '/[A-Z]+/', $template_name ) ) {
+ $error_message = __( 'Template names must not contain uppercase characters.' );
+ $error_code = 'template_name_no_uppercase';
+ } elseif ( ! preg_match( '/^[a-z0-9-]+\/\/[a-z0-9-]+$/', $template_name ) ) {
+ $error_message = __( 'Template names must contain a namespace prefix. Example: my-plugin//my-custom-template' );
+ $error_code = 'template_no_prefix';
+ } elseif ( $this->is_registered( $template_name ) ) {
+ /* translators: %s: Template name. */
+ $error_message = sprintf( __( 'Template "%s" is already registered.' ), $template_name );
+ $error_code = 'template_already_registered';
+ }
+
+ if ( $error_message ) {
+ _doing_it_wrong(
+ __METHOD__,
+ $error_message,
+ '6.7.0'
+ );
+ return new WP_Error( $error_code, $error_message );
+ }
+
+ if ( ! $template ) {
+ $theme_name = get_stylesheet();
+ list( $plugin, $slug ) = explode( '//', $template_name );
+ $default_template_types = get_default_block_template_types();
+
+ $template = new WP_Block_Template();
+ $template->id = $theme_name . '//' . $slug;
+ $template->theme = $theme_name;
+ $template->plugin = $plugin;
+ $template->author = null;
+ $template->content = isset( $args['content'] ) ? $args['content'] : '';
+ $template->source = 'plugin';
+ $template->slug = $slug;
+ $template->type = 'wp_template';
+ $template->title = isset( $args['title'] ) ? $args['title'] : $template_name;
+ $template->description = isset( $args['description'] ) ? $args['description'] : '';
+ $template->status = 'publish';
+ $template->origin = 'plugin';
+ $template->is_custom = ! isset( $default_template_types[ $template_name ] );
+ $template->post_types = isset( $args['post_types'] ) ? $args['post_types'] : array();
+ }
+
+ $this->registered_templates[ $template_name ] = $template;
+
+ return $template;
+ }
+
+ /**
+ * Retrieves all registered templates.
+ *
+ * @since 6.7.0
+ *
+ * @return WP_Block_Template[] Associative array of `$template_name => $template` pairs.
+ */
+ public function get_all_registered() {
+ return $this->registered_templates;
+ }
+
+ /**
+ * Retrieves a registered template by its name.
+ *
+ * @since 6.7.0
+ *
+ * @param string $template_name Template name including namespace.
+ * @return WP_Block_Template|null The registered template, or null if it is not registered.
+ */
+ public function get_registered( $template_name ) {
+ if ( ! $this->is_registered( $template_name ) ) {
+ return null;
+ }
+
+ return $this->registered_templates[ $template_name ];
+ }
+
+ /**
+ * Retrieves a registered template by its slug.
+ *
+ * @since 6.7.0
+ *
+ * @param string $template_slug Slug of the template.
+ * @return WP_Block_Template|null The registered template, or null if it is not registered.
+ */
+ public function get_by_slug( $template_slug ) {
+ $all_templates = $this->get_all_registered();
+
+ if ( ! $all_templates ) {
+ return null;
+ }
+
+ foreach ( $all_templates as $template ) {
+ if ( $template->slug === $template_slug ) {
+ return $template;
+ }
+ }
+
+ return null;
+ }
+
+ /**
+ * Retrieves registered templates matching a query.
+ *
+ * @since 6.7.0
+ *
+ * @param array $query {
+ * Arguments to retrieve templates. Optional, empty by default.
+ *
+ * @type string[] $slug__in List of slugs to include.
+ * @type string[] $slug__not_in List of slugs to skip.
+ * @type string $post_type Post type to get the templates for.
+ * }
+ * @return WP_Block_Template[] Associative array of `$template_name => $template` pairs.
+ */
+ public function get_by_query( $query = array() ) {
+ $all_templates = $this->get_all_registered();
+
+ if ( ! $all_templates ) {
+ return array();
+ }
+
+ $query = wp_parse_args(
+ $query,
+ array(
+ 'slug__in' => array(),
+ 'slug__not_in' => array(),
+ 'post_type' => '',
+ )
+ );
+ $slugs_to_include = $query['slug__in'];
+ $slugs_to_skip = $query['slug__not_in'];
+ $post_type = $query['post_type'];
+
+ $matching_templates = array();
+ foreach ( $all_templates as $template_name => $template ) {
+ if ( $slugs_to_include && ! in_array( $template->slug, $slugs_to_include, true ) ) {
+ continue;
+ }
+
+ if ( $slugs_to_skip && in_array( $template->slug, $slugs_to_skip, true ) ) {
+ continue;
+ }
+
+ if ( $post_type && ! in_array( $post_type, $template->post_types, true ) ) {
+ continue;
+ }
+
+ $matching_templates[ $template_name ] = $template;
+ }
+
+ return $matching_templates;
+ }
+
+ /**
+ * Checks if a template is registered.
+ *
+ * @since 6.7.0
+ *
+ * @param string $template_name Template name.
+ * @return bool True if the template is registered, false otherwise.
+ */
+ public function is_registered( $template_name ) {
+ return isset( $this->registered_templates[ $template_name ] );
+ }
+
+ /**
+ * Unregisters a template.
+ *
+ * @since 6.7.0
+ *
+ * @param string $template_name Template name including namespace.
+ * @return WP_Block_Template|WP_Error The unregistered template on success, or WP_Error on failure.
+ */
+ public function unregister( $template_name ) {
+ if ( ! $this->is_registered( $template_name ) ) {
+ _doing_it_wrong(
+ __METHOD__,
+ /* translators: %s: Template name. */
+ sprintf( __( 'Template "%s" is not registered.' ), $template_name ),
+ '6.7.0'
+ );
+ /* translators: %s: Template name. */
+ return new WP_Error( 'template_not_registered', __( 'Template "%s" is not registered.' ) );
+ }
+
+ $unregistered_template = $this->registered_templates[ $template_name ];
+ unset( $this->registered_templates[ $template_name ] );
+
+ return $unregistered_template;
+ }
+
+ /**
+ * Utility method to retrieve the main instance of the class.
+ *
+ * The instance will be created if it does not exist yet.
+ *
+ * @since 6.7.0
+ *
+ * @return WP_Block_Templates_Registry The main instance.
+ */
+ public static function get_instance() {
+ if ( null === self::$instance ) {
+ self::$instance = new self();
+ }
+
+ return self::$instance;
+ }
+}
diff --git a/src/wp-includes/class-wp-block.php b/src/wp-includes/class-wp-block.php
index f7fd53dfc9710..8cfa996028da2 100644
--- a/src/wp-includes/class-wp-block.php
+++ b/src/wp-includes/class-wp-block.php
@@ -237,6 +237,7 @@ public function __get( $name ) {
*
* @since 6.5.0
* @since 6.6.0 Handle the `__default` attribute for pattern overrides.
+ * @since 6.7.0 Return any updated bindings metadata in the computed attributes.
*
* @return array The computed block attributes for the provided block bindings.
*/
@@ -284,6 +285,14 @@ private function process_block_bindings() {
: array( 'source' => 'core/pattern-overrides' );
}
$bindings = $updated_bindings;
+ /*
+ * Update the bindings metadata of the computed attributes.
+ * This ensures the block receives the expanded __default binding metadata when it renders.
+ */
+ $computed_attributes['metadata'] = array_merge(
+ $parsed_block['attrs']['metadata'],
+ array( 'bindings' => $bindings )
+ );
}
foreach ( $bindings as $attribute_name => $block_binding ) {
@@ -301,6 +310,15 @@ private function process_block_bindings() {
continue;
}
+ // Adds the necessary context defined by the source.
+ if ( ! empty( $block_binding_source->uses_context ) ) {
+ foreach ( $block_binding_source->uses_context as $context_name ) {
+ if ( array_key_exists( $context_name, $this->available_context ) ) {
+ $this->context[ $context_name ] = $this->available_context[ $context_name ];
+ }
+ }
+ }
+
$source_args = ! empty( $block_binding['args'] ) && is_array( $block_binding['args'] ) ? $block_binding['args'] : array();
$source_value = $block_binding_source->get_value( $source_args, $this, $attribute_name );
diff --git a/src/wp-includes/class-wp-customize-manager.php b/src/wp-includes/class-wp-customize-manager.php
index 1356fc9c18bf6..8d5e94af94b8d 100644
--- a/src/wp-includes/class-wp-customize-manager.php
+++ b/src/wp-includes/class-wp-customize-manager.php
@@ -3334,11 +3334,16 @@ protected function get_lock_user_data( $user_id ) {
return null;
}
- return array(
- 'id' => $lock_user->ID,
- 'name' => $lock_user->display_name,
- 'avatar' => get_avatar_url( $lock_user->ID, array( 'size' => 128 ) ),
+ $user_details = array(
+ 'id' => $lock_user->ID,
+ 'name' => $lock_user->display_name,
);
+
+ if ( get_option( 'show_avatars' ) ) {
+ $user_details['avatar'] = get_avatar_url( $lock_user->ID, array( 'size' => 128 ) );
+ }
+
+ return $user_details;
}
/**
@@ -4307,8 +4312,10 @@ public function render_control_templates() {
" ),
+ "",
+ 'Should have preserved text inside a SCRIPT element, except for replacing NULL bytes.'
+ );
+ }
+
+ /**
+ * Ensures that STYLE contents are not escaped, as they are not parsed like text nodes are.
+ *
+ * @ticket 62036
+ */
+ public function test_style_contents_are_not_escaped() {
+ $this->assertSame(
+ WP_HTML_Processor::normalize( "" ),
+ "",
+ 'Should have preserved text inside a STYLE element, except for replacing NULL bytes.'
+ );
+ }
+
+ public function test_unexpected_closing_tags_are_removed() {
+ $this->assertSame(
+ WP_HTML_Processor::normalize( 'one