Merge branch 'trunk' into 64418/customizer-allow-arbitrary-custom-css

Author: sirreal

src/wp-admin/includes/ajax-actions.php

@@ -455,7 +455,7 @@ function wp_ajax_logged_in() {
  * @access private
  *
  * @param int $comment_id Comment ID.
- * @param int $delta      Change in the number of total comments. Default -1.
+ * @param int $delta      Optional. Change in the number of total comments. Default -1.
  */
 function _wp_ajax_delete_comment_response( $comment_id, $delta = -1 ) {
 	$total    = isset( $_POST['_total'] ) ? (int) $_POST['_total'] : 0;

src/wp-admin/includes/class-wp-comments-list-table.php

@@ -70,18 +70,22 @@ public function floated_admin_avatar( $name, $comment_id ) {
 	}
 
 	/**
-	 * @return bool
+	 * Checks if the user can edit posts.
+	 *
+	 * @return bool Whether the user can edit posts.
 	 */
 	public function ajax_user_can() {
 		return current_user_can( 'edit_posts' );
 	}
 
 	/**
-	 * @global string $mode           List table view mode.
-	 * @global int    $post_id
-	 * @global string $comment_status
-	 * @global string $comment_type
-	 * @global string $search
+	 * Prepares the comments list items.
+	 *
+	 * @global string $mode           Current list table display mode.
+	 * @global int    $post_id        Current post ID filter.
+	 * @global string $comment_status Comment status filter.
+	 * @global string $comment_type   Comment type filter.
+	 * @global string $search         Search term.
 	 */
 	public function prepare_items() {
 		global $mode, $post_id, $comment_status, $comment_type, $search;
@@ -151,6 +155,7 @@ public function prepare_items() {
 			'number'                    => $number,
 			'post_id'                   => $post_id,
 			'type'                      => $comment_type,
+			'type__not_in'              => array( 'note' ),
 			'orderby'                   => $orderby,
 			'order'                     => $order,
 			'post_type'                 => $post_type,
@@ -198,8 +203,10 @@ public function prepare_items() {
 	}
 
 	/**
-	 * @param string $comment_status
-	 * @return int
+	 * Gets the number of comments to display per page.
+	 *
+	 * @param string $comment_status Comment status.
+	 * @return int Comments per page.
 	 */
 	public function get_per_page( $comment_status = 'all' ) {
 		$comments_per_page = $this->get_items_per_page( 'edit_comments_per_page' );
@@ -216,6 +223,8 @@ public function get_per_page( $comment_status = 'all' ) {
 	}
 
 	/**
+	 * Displays a message when no comments are found.
+	 *
 	 * @global string $comment_status
 	 */
 	public function no_items() {
@@ -231,9 +240,13 @@ public function no_items() {
 	}
 
 	/**
-	 * @global int $post_id
+	 * Returns an array of comment status links.
+	 *
+	 * @global int    $post_id
 	 * @global string $comment_status
 	 * @global string $comment_type
+	 *
+	 * @return array<string, string> Comment status HTML links keyed by view.
 	 */
 	protected function get_views() {
 		global $post_id, $comment_status, $comment_type;
@@ -354,9 +367,11 @@ protected function get_views() {
 	}
 
 	/**
-	 * @global string $comment_status
+	 * Gets the available bulk actions for the comments list.
+	 *
+	 * @global string $comment_status Current comment status filter.
 	 *
-	 * @return array
+	 * @return array<string, string> Bulk action labels keyed by action name.
 	 */
 	protected function get_bulk_actions() {
 		global $comment_status;
@@ -395,10 +410,12 @@ protected function get_bulk_actions() {
 	}
 
 	/**
+	 * Displays extra controls between bulk actions and pagination.
+	 *
 	 * @global string $comment_status
 	 * @global string $comment_type
 	 *
-	 * @param string $which
+	 * @param string $which The location of the extra table nav markup: Either 'top' or 'bottom'.
 	 */
 	protected function extra_tablenav( $which ) {
 		global $comment_status, $comment_type;
@@ -453,7 +470,9 @@ protected function extra_tablenav( $which ) {
 	}
 
 	/**
-	 * @return string|false
+	 * Gets the current action selected from the bulk actions dropdown.
+	 *
+	 * @return string|false Current action or false if none.
 	 */
 	public function current_action() {
 		if ( isset( $_REQUEST['delete_all'] ) || isset( $_REQUEST['delete_all2'] ) ) {
@@ -464,6 +483,8 @@ public function current_action() {
 	}
 
 	/**
+	 * Gets the list of columns.
+	 *
 	 * @global int $post_id
 	 *
 	 * @return string[] Array of column titles keyed by their column name.
@@ -547,7 +568,9 @@ protected function comment_type_dropdown( $comment_type ) {
 	}
 
 	/**
-	 * @return array
+	 * Gets a list of sortable columns.
+	 *
+	 * @return array<string, string|array> The sortable columns.
 	 */
 	protected function get_sortable_columns() {
 		return array(
@@ -638,10 +661,12 @@ public function display() {
 	}
 
 	/**
+	 * Generates content for a single row of the table.
+	 *
 	 * @global WP_Post    $post    Global post object.
 	 * @global WP_Comment $comment Global comment object.
 	 *
-	 * @param WP_Comment $item
+	 * @param WP_Comment $item The comment object.
 	 */
 	public function single_row( $item ) {
 		global $post, $comment;
@@ -917,6 +942,8 @@ protected function handle_row_actions( $item, $column_name, $primary ) {
 	}
 
 	/**
+	 * Outputs the checkbox column.
+	 *
 	 * @since 5.9.0 Renamed `$comment` to `$item` to match parent class for PHP 8 named parameter support.
 	 *
 	 * @param WP_Comment $item The comment object.
@@ -941,6 +968,8 @@ public function column_cb( $item ) {
 	}
 
 	/**
+	 * Outputs the comment column.
+	 *
 	 * @param WP_Comment $comment The comment object.
 	 */
 	public function column_comment( $comment ) {
@@ -980,6 +1009,8 @@ public function column_comment( $comment ) {
 	}
 
 	/**
+	 * Outputs the author column.
+	 *
 	 * @global string $comment_status
 	 *
 	 * @param WP_Comment $comment The comment object.
@@ -1039,6 +1070,8 @@ public function column_author( $comment ) {
 	}
 
 	/**
+	 * Outputs the date column.
+	 *
 	 * @param WP_Comment $comment The comment object.
 	 */
 	public function column_date( $comment ) {
@@ -1067,6 +1100,8 @@ public function column_date( $comment ) {
 	}
 
 	/**
+	 * Outputs the response column.
+	 *
 	 * @param WP_Comment $comment The comment object.
 	 */
 	public function column_response( $comment ) {
@@ -1113,6 +1148,8 @@ public function column_response( $comment ) {
 	}
 
 	/**
+	 * Outputs the default column.
+	 *
 	 * @since 5.9.0 Renamed `$comment` to `$item` to match parent class for PHP 8 named parameter support.
 	 *
 	 * @param WP_Comment $item        The comment object.

src/wp-admin/includes/class-wp-importer.php

@@ -1,7 +1,12 @@
 <?php
 /**
  * WP_Importer base class
+ *
+ * @package WordPress
+ * @subpackage Importer
+ * @since 3.0.0
  */
+
 #[AllowDynamicProperties]
 class WP_Importer {
 	/**

src/wp-admin/includes/class-wp-list-table.php

@@ -80,14 +80,14 @@ class WP_List_Table {
 	protected $_column_headers;
 
 	/**
-	 * {@internal Missing Summary}
+	 * List of private properties made readable for backward compatibility.
 	 *
 	 * @var array
 	 */
 	protected $compat_fields = array( '_args', '_pagination_args', 'screen', '_actions', '_pagination' );
 
 	/**
-	 * {@internal Missing Summary}
+	 * List of private/protected methods made readable for backward compatibility.
 	 *
 	 * @var array
 	 */
@@ -280,7 +280,7 @@ public function __call( $name, $arguments ) {
 	}
 
 	/**
-	 * Checks the current user's permissions
+	 * Checks the current user's permissions.
 	 *
 	 * @since 3.1.0
 	 * @abstract

src/wp-admin/nav-menus.php

@@ -672,12 +672,14 @@
 }
 
 /**
+ * Adds a CSS class to display the max depth of the navigation menu.
+ *
  * @since 3.0.0
  *
- * @global int $_wp_nav_menu_max_depth
+ * @global int $_wp_nav_menu_max_depth Maximum depth of the navigation menu.
  *
- * @param string $classes
- * @return string
+ * @param string $classes Existing CSS classes for the body tag.
+ * @return string Modified CSS classes including the menu max depth class.
  */
 function wp_nav_menu_max_depth( $classes ) {
 	global $_wp_nav_menu_max_depth;

src/wp-admin/update-core.php

@@ -840,7 +840,7 @@ function list_translation_updates() {
  *
  * @global WP_Filesystem_Base $wp_filesystem WordPress filesystem subclass.
  *
- * @param bool $reinstall
+ * @param bool $reinstall Optional. Whether to reinstall WordPress. Default false.
  */
 function do_core_upgrade( $reinstall = false ) {
 	global $wp_filesystem;

src/wp-includes/deprecated.php

@@ -6479,3 +6479,33 @@ function wp_print_auto_sizes_contain_css_fix() {
 	<style>img:is([sizes="auto" i], [sizes^="auto," i]) { contain-intrinsic-size: 3000px 1500px }</style>
 	<?php
 }
+
+/**
+ * Sanitizes an attributes array into an attributes string to be placed inside a `<script>` tag.
+ *
+ * This function is deprecated, use {@see wp_get_script_tag()} or {@see wp_get_inline_script_tag()} instead.
+ *
+ * @since 5.7.0
+ * @deprecated 7.0.0 Use wp_get_script_tag() or wp_get_inline_script_tag().
+ * @see wp_get_script_tag()
+ * @see wp_get_inline_script_tag()
+ *
+ * @param array<string, string|bool> $attributes Key-value pairs representing `<script>` tag attributes.
+ * @return string String made of sanitized `<script>` tag attributes.
+ */
+function wp_sanitize_script_attributes( $attributes ) {
+	_deprecated_function( __FUNCTION__, '7.0.0', 'wp_get_script_tag() or wp_get_inline_script_tag()' );
+
+	$attributes_string = '';
+	foreach ( $attributes as $attribute_name => $attribute_value ) {
+		if ( is_bool( $attribute_value ) ) {
+			if ( $attribute_value ) {
+				$attributes_string .= ' ' . esc_attr( $attribute_name );
+			}
+		} else {
+			$attributes_string .= sprintf( ' %1$s="%2$s"', esc_attr( $attribute_name ), esc_attr( $attribute_value ) );
+		}
+	}
+	return $attributes_string;
+}
+

src/wp-includes/script-loader.php

@@ -1630,7 +1630,7 @@ function wp_default_styles( $styles ) {
 	$styles->add( 'code-editor', "/wp-admin/css/code-editor$suffix.css", array( 'wp-codemirror' ) );
 	$styles->add( 'site-health', "/wp-admin/css/site-health$suffix.css" );
 
-	$styles->add( 'wp-admin', false, array( 'dashicons', 'common', 'forms', 'admin-menu', 'dashboard', 'list-tables', 'edit', 'revisions', 'media', 'themes', 'about', 'nav-menus', 'widgets', 'site-icon', 'l10n' ) );
+	$styles->add( 'wp-admin', false, array( 'dashicons', 'common', 'forms', 'admin-menu', 'dashboard', 'list-tables', 'edit', 'revisions', 'media', 'themes', 'about', 'nav-menus', 'widgets', 'site-icon', 'l10n', 'wp-base-styles' ) );
 
 	$styles->add( 'login', "/wp-admin/css/login$suffix.css", array( 'dashicons', 'buttons', 'forms', 'l10n' ) );
 	$styles->add( 'install', "/wp-admin/css/install$suffix.css", array( 'dashicons', 'buttons', 'forms', 'l10n' ) );
@@ -1713,6 +1713,7 @@ function wp_default_styles( $styles ) {
 
 	// Only add CONTENT styles here that should be enqueued in the iframe!
 	$wp_edit_blocks_dependencies = array(
+		'wp-base-styles',
 		'wp-components',
 		/*
 		 * This needs to be added before the block library styles,
@@ -1752,6 +1753,7 @@ function wp_default_styles( $styles ) {
 		'block-editor'         => array( 'wp-components', 'wp-preferences' ),
 		'block-library'        => array(),
 		'block-directory'      => array(),
+		'base-styles'          => array(),
 		'components'           => array(),
 		'commands'             => array( 'wp-components' ),
 		'edit-post'            => array(
@@ -1814,6 +1816,11 @@ function wp_default_styles( $styles ) {
 		if ( 'block-library' === $package && wp_should_load_separate_core_block_assets() ) {
 			$path = "/wp-includes/css/dist/$package/common$suffix.css";
 		}
+
+		if ( 'base-styles' === $package ) {
+			$path = "/wp-includes/css/dist/base-styles/admin-schemes$suffix.css";
+		}
+
 		$styles->add( $handle, $path, $dependencies );
 		$styles->add_data( $handle, 'path', ABSPATH . $path );
 	}
@@ -2875,37 +2882,6 @@ function wp_enqueue_editor_format_library_assets() {
 	wp_enqueue_style( 'wp-format-library' );
 }
 
-/**
- * Sanitizes an attributes array into an attributes string to be placed inside a `<script>` tag.
- *
- * Automatically injects type attribute if needed.
- * Used by {@see wp_get_script_tag()} and {@see wp_get_inline_script_tag()}.
- *
- * @since 5.7.0
- *
- * @param array<string, string|bool> $attributes Key-value pairs representing `<script>` tag attributes.
- * @return string String made of sanitized `<script>` tag attributes.
- */
-function wp_sanitize_script_attributes( $attributes ) {
-	$attributes_string = '';
-
-	/*
-	 * If HTML5 script tag is supported, only the attribute name is added
-	 * to $attributes_string for entries with a boolean value, and that are true.
-	 */
-	foreach ( $attributes as $attribute_name => $attribute_value ) {
-		if ( is_bool( $attribute_value ) ) {
-			if ( $attribute_value ) {
-				$attributes_string .= ' ' . esc_attr( $attribute_name );
-			}
-		} else {
-			$attributes_string .= sprintf( ' %1$s="%2$s"', esc_attr( $attribute_name ), esc_attr( $attribute_value ) );
-		}
-	}
-
-	return $attributes_string;
-}
-
 /**
  * Formats `<script>` loader tags.
  *