Skip to content

Commit 0efa1f5

Browse files
dmsnelldmsnell
committed
Restore: Sync trunk
See changelog in 474a396
2 parents 647bc04 + 474a396 commit 0efa1f5

21 files changed

+57
-31
lines changed

‎src/wp-admin/admin.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -395,17 +395,22 @@
395395
*/
396396
if ( 'page' === $typenow ) {
397397
if ( 'post-new.php' === $pagenow ) {
398+
/** This action is documented in wp-admin/admin.php */
398399
do_action( 'load-page-new.php' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
399400
} elseif ( 'post.php' === $pagenow ) {
401+
/** This action is documented in wp-admin/admin.php */
400402
do_action( 'load-page.php' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
401403
}
402404
} elseif ( 'edit-tags.php' === $pagenow ) {
403405
if ( 'category' === $taxnow ) {
406+
/** This action is documented in wp-admin/admin.php */
404407
do_action( 'load-categories.php' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
405408
} elseif ( 'link_category' === $taxnow ) {
409+
/** This action is documented in wp-admin/admin.php */
406410
do_action( 'load-edit-link-categories.php' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
407411
}
408412
} elseif ( 'term.php' === $pagenow ) {
413+
/** This action is documented in wp-admin/admin.php */
409414
do_action( 'load-edit-tags.php' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
410415
}
411416
}

‎src/wp-admin/css/install.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ fieldset {
7979
width: 84px;
8080
height: 84px;
8181
overflow: hidden;
82-
background-image: url(../images/w-logo-blue.png?ver=20131202);
83-
background-image: none, url(../images/wordpress-logo.svg?ver=20131107);
82+
background-image: url(../images/w-logo-gray.png?ver=20260303);
83+
background-image: none, url(../images/wordpress-logo-gray.svg?ver=20260303);
8484
background-size: 84px;
8585
background-position: center top;
8686
background-repeat: no-repeat;

‎src/wp-admin/css/login.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -283,8 +283,8 @@ p {
283283
}
284284

285285
.login h1 a {
286-
background-image: url(../images/w-logo-blue.png?ver=20131202);
287-
background-image: none, url(../images/wordpress-logo.svg?ver=20131107);
286+
background-image: url(../images/w-logo-gray.png?ver=20260303);
287+
background-image: none, url(../images/wordpress-logo-gray.svg?ver=20260303);
288288
background-size: 84px;
289289
background-position: center top;
290290
background-repeat: no-repeat;

‎src/wp-admin/images/w-logo-gray.png‎

4.39 KB
Loading

‎src/wp-admin/images/wordpress-logo-gray.svg‎

Lines changed: 1 addition & 0 deletions
Loading

‎src/wp-admin/includes/bookmark.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*
1212
* @since 2.0.0
1313
*
14-
* @return int|WP_Error Value 0 or WP_Error on failure. The link ID on success.
14+
* @return int The link ID on success. The value 0 on failure.
1515
*/
1616
function add_link() {
1717
return edit_link();
@@ -23,7 +23,7 @@ function add_link() {
2323
* @since 2.0.0
2424
*
2525
* @param int $link_id Optional. ID of the link to edit. Default 0.
26-
* @return int|WP_Error Value 0 or WP_Error on failure. The link ID on success.
26+
* @return int The link ID on success. The value 0 on failure.
2727
*/
2828
function edit_link( $link_id = 0 ) {
2929
if ( ! current_user_can( 'manage_links' ) ) {
@@ -169,7 +169,7 @@ function get_link_to_edit( $link ) {
169169
* If empty, uses default link category.
170170
* }
171171
* @param bool $wp_error Optional. Whether to return a WP_Error object on failure. Default false.
172-
* @return int|WP_Error Value 0 or WP_Error on failure. The link ID on success.
172+
* @return int|WP_Error The link ID on success. The value 0 or WP_Error on failure.
173173
*/
174174
function wp_insert_link( $linkdata, $wp_error = false ) {
175175
global $wpdb;
@@ -295,7 +295,7 @@ function wp_set_link_cats( $link_id = 0, $link_categories = array() ) {
295295
* @since 2.0.0
296296
*
297297
* @param array $linkdata Link data to update. See wp_insert_link() for accepted arguments.
298-
* @return int|WP_Error Value 0 or WP_Error on failure. The updated link ID on success.
298+
* @return int The updated link ID on success. The value 0 on failure.
299299
*/
300300
function wp_update_link( $linkdata ) {
301301
$link_id = (int) $linkdata['link_id'];

‎src/wp-admin/includes/schema.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1033,7 +1033,6 @@ function populate_network( $network_id = 1, $domain = '', $email = '', $site_nam
10331033
}
10341034

10351035
// Check for network collision.
1036-
$network_exists = false;
10371036
if ( is_multisite() ) {
10381037
if ( get_network( $network_id ) ) {
10391038
$errors->add( 'siteid_exists', __( 'The network already exists.' ) );

‎src/wp-content/themes/twentyseventeen/inc/template-tags.php‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -110,22 +110,23 @@ function twentyseventeen_entry_footer() {
110110

111111
if ( ! function_exists( 'twentyseventeen_edit_link' ) ) :
112112
/**
113-
* Returns an accessibility-friendly link to edit a post or page.
113+
* Displays an accessibility-friendly link to edit a post or page.
114114
*
115-
* This also gives a little context about what exactly we're editing
116-
* (post or page?) so that users understand a bit more where they are in terms
117-
* of the template hierarchy and their content. Helpful when/if the single-page
118-
* layout with multiple posts/pages shown gets confusing.
115+
* @since Twenty Seventeen 1.0
116+
* @since Twenty Seventeen 4.1 Added `$post_id` parameter.
117+
*
118+
* @param int $post_id Post ID. Default 0.
119119
*/
120-
function twentyseventeen_edit_link() {
120+
function twentyseventeen_edit_link( $post_id = 0 ) {
121121
edit_post_link(
122122
sprintf(
123123
/* translators: %s: Post title. Only visible to screen readers. */
124124
__( 'Edit<span class="screen-reader-text"> "%s"</span>', 'twentyseventeen' ),
125-
get_the_title()
125+
get_the_title( $post_id )
126126
),
127127
'<span class="edit-link">',
128-
'</span>'
128+
'</span>',
129+
$post_id
129130
);
130131
}
131132
endif;

‎src/wp-includes/block-editor.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -338,6 +338,7 @@ function _wp_get_iframed_editor_assets() {
338338
* front-end assets for the content.
339339
*/
340340
add_filter( 'should_load_block_editor_scripts_and_styles', '__return_false' );
341+
/** This action is documented in wp-includes/script-loader.php */
341342
do_action( 'enqueue_block_assets' );
342343
remove_filter( 'should_load_block_editor_scripts_and_styles', '__return_false' );
343344

‎src/wp-includes/category-template.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1258,8 +1258,8 @@ function tag_description( $tag = 0 ) {
12581258
* @since 2.8.0
12591259
* @since 4.9.2 The `$taxonomy` parameter was deprecated.
12601260
*
1261-
* @param int $term Optional. Term ID. Defaults to the current term ID.
1262-
* @param null $deprecated Deprecated. Not used.
1261+
* @param int $term Optional. Term ID. Defaults to the current term ID.
1262+
* @param mixed $deprecated Not used.
12631263
* @return string Term description, if available.
12641264
*/
12651265
function term_description( $term = 0, $deprecated = null ) {

0 commit comments

Comments
 (0)