Skip to content

Commit e0ab877

Browse files
Merge branch 'trunk' into backport/78404-site-preview-dip
2 parents 827f411 + 9a4f91d commit e0ab877

25 files changed

Lines changed: 654 additions & 76 deletions

src/js/_enqueues/lib/admin-bar.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@
417417
};
418418
}
419419

420-
// Get the closest matching elent.
420+
// Get the closest matching element.
421421
for ( ; el && el !== document; el = el.parentNode ) {
422422
if ( el.matches( selector ) ) {
423423
return el;

src/js/_enqueues/wp/api.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -983,7 +983,7 @@
983983
},
984984

985985
/**
986-
* Extend Backbone.Collection.sync to add nince and pagination support.
986+
* Extend Backbone.Collection.sync to add nonce and pagination support.
987987
*
988988
* Set nonce header before every Backbone sync.
989989
*
@@ -1288,7 +1288,7 @@
12881288
parentName = wp.api.utils.extractRoutePart( modelRoute.index, 1, routeModel.get( 'versionString' ), false ),
12891289
routeEnd = wp.api.utils.extractRoutePart( modelRoute.index, 1, routeModel.get( 'versionString' ), true );
12901290

1291-
// Clear the parent part of the rouite if its actually the version string.
1291+
// Clear the parent part of the route if it's actually the version string.
12921292
if ( parentName === routeModel.get( 'versionString' ) ) {
12931293
parentName = '';
12941294
}

src/js/_enqueues/wp/customize/controls.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,7 @@
590590
return deferred.reject( { code: 'illegal_status_in_changeset_update' } ).promise();
591591
}
592592

593-
// Dates not beung allowed for revisions are is a technical limitation of post revisions.
593+
// Dates not being allowed for revisions is a technical limitation of post revisions.
594594
if ( submittedArgs.date && submittedArgs.autosave ) {
595595
return deferred.reject( { code: 'illegal_autosave_with_date_gmt' } ).promise();
596596
}

src/js/_enqueues/wp/customize/nav-menus.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3539,7 +3539,7 @@
35393539

35403540
/**
35413541
* Apply sanitize_text_field()-like logic to the supplied name, returning a
3542-
* "unnammed" fallback string if the name is then empty.
3542+
* "unnamed" fallback string if the name is then empty.
35433543
*
35443544
* @alias wp.customize.Menus~displayNavMenuName
35453545
*

src/wp-content/themes/twentysixteen/css/editor-blocks.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -349,6 +349,11 @@ figure[class*="wp-block-"] > figcaption {
349349
font-style: normal;
350350
}
351351

352+
.wp-block-quote__citation em,
353+
.wp-block-quote__citation i {
354+
font-style: italic;
355+
}
356+
352357
.wp-block-quote strong,
353358
.wp-block-quote b {
354359
font-weight: 400;

src/wp-content/themes/twentysixteen/style.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,11 @@ blockquote cite {
385385
font-style: normal;
386386
}
387387

388+
blockquote :where(cite) em,
389+
blockquote :where(cite) i {
390+
font-style: italic;
391+
}
392+
388393
blockquote strong,
389394
blockquote b {
390395
font-weight: 400;

src/wp-content/themes/twentyten/functions.php

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@
7272
* @uses set_post_thumbnail_size() To set a custom post thumbnail size.
7373
*
7474
* @since Twenty Ten 1.0
75+
*
76+
* @global string $wp_version The WordPress version string.
7577
*/
7678
function twentyten_setup() {
7779

@@ -436,7 +438,12 @@ function twentyten_custom_excerpt_more( $output ) {
436438
function twentyten_remove_gallery_css( $css ) {
437439
return preg_replace( "#<style type='text/css'>(.*?)</style>#s", '', $css );
438440
}
439-
// Backward compatibility with WordPress 3.0.
441+
442+
/**
443+
* Backward compatibility with WordPress 3.0.
444+
*
445+
* @global string $wp_version The WordPress version string.
446+
*/
440447
if ( version_compare( $GLOBALS['wp_version'], '3.1', '<' ) ) {
441448
add_filter( 'gallery_style', 'twentyten_remove_gallery_css' );
442449
}
@@ -452,8 +459,10 @@ function twentyten_remove_gallery_css( $css ) {
452459
*
453460
* @since Twenty Ten 1.0
454461
*
462+
* @global WP_Comment $comment Global comment object.
463+
*
455464
* @param WP_Comment $comment The comment object.
456-
* @param array $args An array of arguments. @see get_comment_reply_link()
465+
* @param array $args An array of comment arguments. @see get_comment_reply_link()
457466
* @param int $depth The depth of the comment.
458467
*/
459468
function twentyten_comment( $comment, $args, $depth ) {

src/wp-content/themes/twentyten/header.php

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,20 @@
88
* @subpackage Twenty_Ten
99
* @since Twenty Ten 1.0
1010
*/
11+
12+
/**
13+
* @global int $page WordPress paginated post page count.
14+
* @global int $paged WordPress archive pagination page count.
15+
*/
16+
global $page, $paged;
17+
1118
?><!DOCTYPE html>
1219
<html <?php language_attributes(); ?>>
1320
<head>
1421
<meta charset="<?php bloginfo( 'charset' ); ?>" />
1522
<title>
1623
<?php
17-
/*
18-
* Print the <title> tag based on what is being viewed.
19-
*/
20-
global $page, $paged;
21-
24+
// Print the <title> tag based on what is being viewed.
2225
wp_title( '|', true, 'right' );
2326

2427
// Add the site name.

src/wp-includes/class-wp-icons-registry.php

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@ class WP_Icons_Registry {
1616
/**
1717
* Registered icons array.
1818
*
19+
* @since 7.0.0
1920
* @var array[]
2021
*/
2122
protected $registered_icons = array();
2223

23-
2424
/**
2525
* Container for the main instance of the class.
2626
*
27+
* @since 7.0.0
2728
* @var WP_Icons_Registry|null
2829
*/
2930
protected static $instance = null;
@@ -39,6 +40,8 @@ class WP_Icons_Registry {
3940
* These icons are defined in @wordpress/packages (Gutenberg repository) as
4041
* SVG files and as entries in a single manifest file. On init, the
4142
* registry is loaded with those icons listed in the manifest.
43+
*
44+
* @since 7.0.0
4245
*/
4346
protected function __construct() {
4447
$icons_directory = __DIR__ . '/images/icon-library/';
@@ -88,6 +91,8 @@ protected function __construct() {
8891
/**
8992
* Registers an icon.
9093
*
94+
* @since 7.0.0
95+
*
9196
* @param string $icon_name Icon name including namespace.
9297
* @param array $icon_properties {
9398
* List of properties for the icon.
@@ -184,6 +189,8 @@ protected function register( $icon_name, $icon_properties ) {
184189
* Logic borrowed from twentytwenty.
185190
* @see twentytwenty_get_theme_svg
186191
*
192+
* @since 7.0.0
193+
*
187194
* @param string $icon_content The icon SVG content to sanitize.
188195
* @return string The sanitized icon SVG content.
189196
*/
@@ -219,6 +226,8 @@ protected function sanitize_icon_content( $icon_content ) {
219226
/**
220227
* Retrieves the content of a registered icon.
221228
*
229+
* @since 7.0.0
230+
*
222231
* @param string $icon_name Icon name including namespace.
223232
* @return string|null The content of the icon, if found.
224233
*/
@@ -245,6 +254,7 @@ protected function get_content( $icon_name ) {
245254
/**
246255
* Retrieves an array containing the properties of a registered icon.
247256
*
257+
* @since 7.0.0
248258
*
249259
* @param string $icon_name Icon name including namespace.
250260
* @return array|null Registered icon properties or `null` if the icon is not registered.
@@ -263,6 +273,8 @@ public function get_registered_icon( $icon_name ) {
263273
/**
264274
* Retrieves all registered icons.
265275
*
276+
* @since 7.0.0
277+
*
266278
* @param string $search Optional. Search term by which to filter the icons.
267279
* @return array[] Array of arrays containing the registered icon properties.
268280
*/
@@ -284,6 +296,7 @@ public function get_registered_icons( $search = '' ) {
284296
/**
285297
* Checks if an icon is registered.
286298
*
299+
* @since 7.0.0
287300
*
288301
* @param string $icon_name Icon name including namespace.
289302
* @return bool True if the icon is registered, false otherwise.
@@ -297,6 +310,7 @@ public function is_registered( $icon_name ) {
297310
*
298311
* The instance will be created if it does not exist yet.
299312
*
313+
* @since 7.0.0
300314
*
301315
* @return WP_Icons_Registry The main instance.
302316
*/

src/wp-includes/class-wp-post.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ final class WP_Post {
3636
*
3737
* @since 3.5.0
3838
* @var string
39+
* @phpstan-var numeric-string
3940
*/
4041
public $post_author = '0';
4142

@@ -206,6 +207,7 @@ final class WP_Post {
206207
*
207208
* @since 3.5.0
208209
* @var string
210+
* @phpstan-var numeric-string
209211
*/
210212
public $comment_count = '0';
211213

0 commit comments

Comments
 (0)