From f83aa63730dc4be41104d67f050dd58879a2ecfc Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Fri, 23 Oct 2020 17:19:14 +0000 Subject: [PATCH] Coding Standards: Split long `printf()` calls for search results for better readability. Follow-up to [49284]. See #37353. Built from https://develop.svn.wordpress.org/trunk@49286 git-svn-id: http://core.svn.wordpress.org/trunk@49048 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/edit-tags.php | 9 +++++++-- wp-admin/edit.php | 9 +++++++-- wp-admin/link-manager.php | 9 +++++++-- wp-admin/network/sites.php | 9 +++++++-- wp-admin/network/themes.php | 9 +++++++-- wp-admin/network/users.php | 9 +++++++-- wp-admin/plugins.php | 9 +++++++-- wp-admin/upload.php | 9 +++++++-- wp-admin/users.php | 9 +++++++-- wp-includes/version.php | 2 +- 10 files changed, 64 insertions(+), 19 deletions(-) diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php index 9408f21eba..cd35a1b326 100644 --- a/wp-admin/edit-tags.php +++ b/wp-admin/edit-tags.php @@ -338,8 +338,13 @@ if ( is_plugin_active( 'wpcat2tag-importer/wpcat2tag-importer.php' ) ) { ' . __( 'Search results for: %s' ) . '', '' . esc_html( wp_unslash( $_REQUEST['s'] ) ) . '' ); + echo ''; + printf( + /* translators: %s: Search query. */ + __( 'Search results for: %s' ), + '' . esc_html( wp_unslash( $_REQUEST['s'] ) ) . '' + ); + echo ''; } ?> diff --git a/wp-admin/edit.php b/wp-admin/edit.php index 75d4773641..8fe8be0a7d 100644 --- a/wp-admin/edit.php +++ b/wp-admin/edit.php @@ -406,8 +406,13 @@ if ( current_user_can( $post_type_object->cap->create_posts ) ) { } if ( isset( $_REQUEST['s'] ) && strlen( $_REQUEST['s'] ) ) { - /* translators: %s: Search query. */ - printf( ' ' . __( 'Search results for: %s' ) . '', '' . get_search_query() . '' ); + echo ''; + printf( + /* translators: %s: Search query. */ + __( 'Search results for: %s' ), + '' . get_search_query() . '' + ); + echo ''; } ?> diff --git a/wp-admin/link-manager.php b/wp-admin/link-manager.php index 4aa4d29260..ff8dba12dc 100644 --- a/wp-admin/link-manager.php +++ b/wp-admin/link-manager.php @@ -104,8 +104,13 @@ echo esc_html( $title ); ' . __( 'Search results for: %s' ) . '', '' . esc_html( wp_unslash( $_REQUEST['s'] ) ) . '' ); + echo ''; + printf( + /* translators: %s: Search query. */ + __( 'Search results for: %s' ), + '' . esc_html( wp_unslash( $_REQUEST['s'] ) ) . '' + ); + echo ''; } ?> diff --git a/wp-admin/network/sites.php b/wp-admin/network/sites.php index 7c6fa7e9b8..0cad45e1cd 100644 --- a/wp-admin/network/sites.php +++ b/wp-admin/network/sites.php @@ -371,8 +371,13 @@ require_once ABSPATH . 'wp-admin/admin-header.php'; ' . __( 'Search results for: %s' ) . '', '' . esc_html( $s ) . '' ); + echo ''; + printf( + /* translators: %s: Search query. */ + __( 'Search results for: %s' ), + '' . esc_html( $s ) . '' + ); + echo ''; } ?> diff --git a/wp-admin/network/themes.php b/wp-admin/network/themes.php index 6f335e7311..ddb6b867f4 100644 --- a/wp-admin/network/themes.php +++ b/wp-admin/network/themes.php @@ -352,8 +352,13 @@ require_once ABSPATH . 'wp-admin/admin-header.php'; ' . __( 'Search results for: %s' ) . '', '' . esc_html( $s ) . '' ); + echo ''; + printf( + /* translators: %s: Search query. */ + __( 'Search results for: %s' ), + '' . esc_html( $s ) . '' + ); + echo ''; } ?> diff --git a/wp-admin/network/users.php b/wp-admin/network/users.php index fe7fe0d61d..e15a5811cd 100644 --- a/wp-admin/network/users.php +++ b/wp-admin/network/users.php @@ -278,8 +278,13 @@ if ( isset( $_REQUEST['updated'] ) && 'true' == $_REQUEST['updated'] && ! empty( endif; if ( strlen( $usersearch ) ) { - /* translators: %s: Search query. */ - printf( '' . __( 'Search results for: %s' ) . '', '' . esc_html( $usersearch ) . '' ); + echo ''; + printf( + /* translators: %s: Search query. */ + __( 'Search results for: %s' ), + '' . esc_html( $usersearch ) . '' + ); + echo ''; } ?> diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php index 1edfdab85e..d8f909a7da 100644 --- a/wp-admin/plugins.php +++ b/wp-admin/plugins.php @@ -727,8 +727,13 @@ if ( ( ! is_multisite() || is_network_admin() ) && current_user_can( 'install_pl } if ( strlen( $s ) ) { - /* translators: %s: Search query. */ - printf( '' . __( 'Search results for: %s' ) . '', '' . esc_html( urldecode( $s ) ) . '' ); + echo ''; + printf( + /* translators: %s: Search query. */ + __( 'Search results for: %s' ), + '' . esc_html( urldecode( $s ) ) . '' + ); + echo ''; } ?> diff --git a/wp-admin/upload.php b/wp-admin/upload.php index 08129a23bc..b690d02506 100644 --- a/wp-admin/upload.php +++ b/wp-admin/upload.php @@ -275,8 +275,13 @@ if ( current_user_can( 'upload_files' ) ) { } if ( isset( $_REQUEST['s'] ) && strlen( $_REQUEST['s'] ) ) { - /* translators: %s: Search query. */ - printf( '' . __( 'Search results for: %s' ) . '', '' . get_search_query() . '' ); + echo ''; + printf( + /* translators: %s: Search query. */ + __( 'Search results for: %s' ), + '' . get_search_query() . '' + ); + echo ''; } ?> diff --git a/wp-admin/users.php b/wp-admin/users.php index 1ff91ec595..a62f6f1286 100644 --- a/wp-admin/users.php +++ b/wp-admin/users.php @@ -570,8 +570,13 @@ switch ( $wp_list_table->current_action() ) { } if ( strlen( $usersearch ) ) { - /* translators: %s: Search query. */ - printf( '' . __( 'Search results for: %s' ) . '', '' . esc_html( $usersearch ) . '' ); + echo ''; + printf( + /* translators: %s: Search query. */ + __( 'Search results for: %s' ), + '' . esc_html( $usersearch ) . '' + ); + echo ''; } ?> diff --git a/wp-includes/version.php b/wp-includes/version.php index 6b7c39c054..e7e561119c 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.6-beta1-49285'; +$wp_version = '5.6-beta1-49286'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.