WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Sergey Biryukov 2020-10-23 17:19:14 +00:00
parent 608ba462dd
commit f83aa63730
10 changed files with 64 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
wp-admin/edit-tags.php
View File

@ -338,8 +338,13 @@ if ( is_plugin_active( 'wpcat2tag-importer/wpcat2tag-importer.php' ) ) {
<?php <?php
if ( isset( $_REQUEST['s'] ) && strlen( $_REQUEST['s'] ) ) { if ( isset( $_REQUEST['s'] ) && strlen( $_REQUEST['s'] ) ) {
echo '<span class="subtitle">';
printf(
/* translators: %s: Search query. */ /* translators: %s: Search query. */
printf( '<span class="subtitle">' . __( 'Search results for: %s' ) . '</span>', '<strong>' . esc_html( wp_unslash( $_REQUEST['s'] ) ) . '</strong>' ); __( 'Search results for: %s' ),
'<strong>' . esc_html( wp_unslash( $_REQUEST['s'] ) ) . '</strong>'
);
echo '</span>';
} }
?> ?>

7
wp-admin/edit.php
View File

@ -406,8 +406,13 @@ if ( current_user_can( $post_type_object->cap->create_posts ) ) {
} }
if ( isset( $_REQUEST['s'] ) && strlen( $_REQUEST['s'] ) ) { if ( isset( $_REQUEST['s'] ) && strlen( $_REQUEST['s'] ) ) {
echo '<span class="subtitle">';
printf(
/* translators: %s: Search query. */ /* translators: %s: Search query. */
printf( ' <span class="subtitle">' . __( 'Search results for: %s' ) . '</span>', '<strong>' . get_search_query() . '</strong>' ); __( 'Search results for: %s' ),
'<strong>' . get_search_query() . '</strong>'
);
echo '</span>';
} }
?> ?>

7
wp-admin/link-manager.php
View File

@ -104,8 +104,13 @@ echo esc_html( $title );
<?php <?php
if ( isset( $_REQUEST['s'] ) && strlen( $_REQUEST['s'] ) ) { if ( isset( $_REQUEST['s'] ) && strlen( $_REQUEST['s'] ) ) {
echo '<span class="subtitle">';
printf(
/* translators: %s: Search query. */ /* translators: %s: Search query. */
printf( '<span class="subtitle">' . __( 'Search results for: %s' ) . '</span>', '<strong>' . esc_html( wp_unslash( $_REQUEST['s'] ) ) . '</strong>' ); __( 'Search results for: %s' ),
'<strong>' . esc_html( wp_unslash( $_REQUEST['s'] ) ) . '</strong>'
);
echo '</span>';
} }
?> ?>

7
wp-admin/network/sites.php
View File

@ -371,8 +371,13 @@ require_once ABSPATH . 'wp-admin/admin-header.php';
<?php <?php
if ( isset( $_REQUEST['s'] ) && strlen( $_REQUEST['s'] ) ) { if ( isset( $_REQUEST['s'] ) && strlen( $_REQUEST['s'] ) ) {
echo '<span class="subtitle">';
printf(
/* translators: %s: Search query. */ /* translators: %s: Search query. */
printf( '<span class="subtitle">' . __( 'Search results for: %s' ) . '</span>', '<strong>' . esc_html( $s ) . '</strong>' ); __( 'Search results for: %s' ),
'<strong>' . esc_html( $s ) . '</strong>'
);
echo '</span>';
} }
?> ?>

7
wp-admin/network/themes.php
View File

@ -352,8 +352,13 @@ require_once ABSPATH . 'wp-admin/admin-header.php';
<?php <?php
if ( isset( $_REQUEST['s'] ) && strlen( $_REQUEST['s'] ) ) { if ( isset( $_REQUEST['s'] ) && strlen( $_REQUEST['s'] ) ) {
echo '<span class="subtitle">';
printf(
/* translators: %s: Search query. */ /* translators: %s: Search query. */
printf( '<span class="subtitle">' . __( 'Search results for: %s' ) . '</span>', '<strong>' . esc_html( $s ) . '</strong>' ); __( 'Search results for: %s' ),
'<strong>' . esc_html( $s ) . '</strong>'
);
echo '</span>';
} }
?> ?>

7
wp-admin/network/users.php
View File

@ -278,8 +278,13 @@ if ( isset( $_REQUEST['updated'] ) && 'true' == $_REQUEST['updated'] && ! empty(
endif; endif;
if ( strlen( $usersearch ) ) { if ( strlen( $usersearch ) ) {
echo '<span class="subtitle">';
printf(
/* translators: %s: Search query. */ /* translators: %s: Search query. */
printf( '<span class="subtitle">' . __( 'Search results for: %s' ) . '</span>', '<strong>' . esc_html( $usersearch ) . '</strong>' ); __( 'Search results for: %s' ),
'<strong>' . esc_html( $usersearch ) . '</strong>'
);
echo '</span>';
} }
?> ?>

7
wp-admin/plugins.php
View File

@ -727,8 +727,13 @@ if ( ( ! is_multisite() || is_network_admin() ) && current_user_can( 'install_pl
} }
if ( strlen( $s ) ) { if ( strlen( $s ) ) {
echo '<span class="subtitle">';
printf(
/* translators: %s: Search query. */ /* translators: %s: Search query. */
printf( '<span class="subtitle">' . __( 'Search results for: %s' ) . '</span>', '<strong>' . esc_html( urldecode( $s ) ) . '</strong>' ); __( 'Search results for: %s' ),
'<strong>' . esc_html( urldecode( $s ) ) . '</strong>'
);
echo '</span>';
} }
?> ?>

7
wp-admin/upload.php
View File

@ -275,8 +275,13 @@ if ( current_user_can( 'upload_files' ) ) {
} }
if ( isset( $_REQUEST['s'] ) && strlen( $_REQUEST['s'] ) ) { if ( isset( $_REQUEST['s'] ) && strlen( $_REQUEST['s'] ) ) {
echo '<span class="subtitle">';
printf(
/* translators: %s: Search query. */ /* translators: %s: Search query. */
printf( '<span class="subtitle">' . __( 'Search results for: %s' ) . '</span>', '<strong>' . get_search_query() . '</strong>' ); __( 'Search results for: %s' ),
'<strong>' . get_search_query() . '</strong>'
);
echo '</span>';
} }
?> ?>

7
wp-admin/users.php
View File

@ -570,8 +570,13 @@ switch ( $wp_list_table->current_action() ) {
} }
if ( strlen( $usersearch ) ) { if ( strlen( $usersearch ) ) {
echo '<span class="subtitle">';
printf(
/* translators: %s: Search query. */ /* translators: %s: Search query. */
printf( '<span class="subtitle">' . __( 'Search results for: %s' ) . '</span>', '<strong>' . esc_html( $usersearch ) . '</strong>' ); __( 'Search results for: %s' ),
'<strong>' . esc_html( $usersearch ) . '</strong>'
);
echo '</span>';
} }
?> ?>

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @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. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.