Changeset 46088 for trunk/src/wp-includes/general-template.php

Timestamp:

09/10/2019 07:22:07 PM (7 years ago)

Author:

SergeyBiryukov

Message:

Docs: Fix placement of some duplicate hook references.

Hook documentation should be on the line directly above the line containing the do_action() or apply_filters() call. The CS auto-fixing, which changed some inconsistent function calls to multi-line function calls, is part of the reason why this was no longer the case for a select group of duplicate hook references.

Includes minor code layout fixes.

See #47110.

File:

• trunk/src/wp-includes/general-template.php (modified) (8 diffs)

trunk/src/wp-includes/general-template.php

@@ -4043 +4043 @@
                 $mid_size = 2;
         }
+
         $add_args   = $args['add_args'];
         $r          = '';
@@ -4056 +4057 @@
                 $link .= $args['add_fragment'];
 
-                /**
-                 * Filters the paginated links for the given archive pages.
-                 *
-                 * @since 3.0.0
-                 *
-                 * @param string $link The paginated link URL.
-                 */
-                $page_links[] = '<a class="prev page-numbers" href="' . esc_url( apply_filters( 'paginate_links', $link ) ) . '">' . $args['prev_text'] . '</a>';
+                $page_links[] = sprintf(
+                        '<a class="prev page-numbers" href="%s">%s</a>',
+                        /**
+                         * Filters the paginated links for the given archive pages.
+                         *
+                         * @since 3.0.0
+                         *
+                         * @param string $link The paginated link URL.
+                         */
+                        esc_url( apply_filters( 'paginate_links', $link ) ),
+                        $args['prev_text']
+                );
         endif;
+
         for ( $n = 1; $n <= $total; $n++ ) :
                 if ( $n == $current ) :
-                        $page_links[] = "<span aria-current='" . esc_attr( $args['aria_current'] ) . "' class='page-numbers current'>" . $args['before_page_number'] . number_format_i18n( $n ) . $args['after_page_number'] . '</span>';
+                        $page_links[] = sprintf(
+                                '<span aria-current="%s" class="page-numbers current">%s</span>',
+                                esc_attr( $args['aria_current'] ),
+                                $args['before_page_number'] . number_format_i18n( $n ) . $args['after_page_number']
+                        );
                         $dots         = true;
                 else :
@@ -4078 +4088 @@
                                 $link .= $args['add_fragment'];
 
-                                /** This filter is documented in wp-includes/general-template.php */
-                                $page_links[] = "<a class='page-numbers' href='" . esc_url( apply_filters( 'paginate_links', $link ) ) . "'>" . $args['before_page_number'] . number_format_i18n( $n ) . $args['after_page_number'] . '</a>';
+                                $page_links[] = sprintf(
+                                        '<a class="page-numbers" href="%s">%s</a>',
+                                        /** This filter is documented in wp-includes/general-template.php */
+                                        esc_url( apply_filters( 'paginate_links', $link ) ),
+                                        $args['before_page_number'] . number_format_i18n( $n ) . $args['after_page_number']
+                                );
                                 $dots         = true;
                         elseif ( $dots && ! $args['show_all'] ) :
@@ -4087 +4101 @@
                 endif;
         endfor;
+
         if ( $args['prev_next'] && $current && $current < $total ) :
                 $link = str_replace( '%_%', $args['format'], $args['base'] );
@@ -4095 +4110 @@
                 $link .= $args['add_fragment'];
 
-                /** This filter is documented in wp-includes/general-template.php */
-                $page_links[] = '<a class="next page-numbers" href="' . esc_url( apply_filters( 'paginate_links', $link ) ) . '">' . $args['next_text'] . '</a>';
+                $page_links[] = sprintf(
+                        '<a class="next page-numbers" href="%s">%s</a>',
+                        /** This filter is documented in wp-includes/general-template.php */
+                        esc_url( apply_filters( 'paginate_links', $link ) ),
+                        $args['next_text']
+                );
         endif;
+
         switch ( $args['type'] ) {
                 case 'array':
@@ -4112 +4132 @@
                         break;
         }
+
         return $r;
 }
@@ -4323 +4344 @@
  */
 function wp_admin_css( $file = 'wp-admin', $force_echo = false ) {
-        // For backward compatibility
+        // For backward compatibility.
         $handle = 0 === strpos( $file, 'css/' ) ? substr( $file, 4 ) : $file;
 
         if ( wp_styles()->query( $handle ) ) {
-                if ( $force_echo || did_action( 'wp_print_styles' ) ) { // we already printed the style queue. Print this one immediately
+                if ( $force_echo || did_action( 'wp_print_styles' ) ) {
+                        // We already printed the style queue. Print this one immediately.
                         wp_print_styles( $handle );
-                } else { // Add to style queue
+                } else {
+                        // Add to style queue.
                         wp_enqueue_style( $handle );
                 }
                 return;
         }
+
+        $stylesheet_link = sprintf(
+                "<link rel='stylesheet' href='%s' type='text/css' />\n",
+                esc_url( wp_admin_css_uri( $file ) )
+        );
 
         /**
@@ -4346 +4374 @@
          *                                relative to wp-admin/. Defaults to 'wp-admin'.
          */
-        echo apply_filters( 'wp_admin_css', "<link rel='stylesheet' href='" . esc_url( wp_admin_css_uri( $file ) ) . "' type='text/css' />\n", $file );
+        echo apply_filters( 'wp_admin_css', $stylesheet_link, $file );
 
         if ( function_exists( 'is_rtl' ) && is_rtl() ) {
+                $rtl_stylesheet_link = sprintf(
+                        "<link rel='stylesheet' href='%s' type='text/css' />\n",
+                        esc_url( wp_admin_css_uri( "$file-rtl" ) )
+                );
+
                 /** This filter is documented in wp-includes/general-template.php */
-                echo apply_filters( 'wp_admin_css', "<link rel='stylesheet' href='" . esc_url( wp_admin_css_uri( "$file-rtl" ) ) . "' type='text/css' />\n", "$file-rtl" );
+                echo apply_filters( 'wp_admin_css', $rtl_stylesheet_link, "$file-rtl" );
         }
 }