Changeset 55364

Timestamp:

02/18/2023 03:07:12 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Improve variables names in post and comment page link functions.

This commit renames a few internal variables for better clarity and consistency:

• $nextpage to $next_page in:
  • get_next_posts_page_link()
  • get_next_posts_link()
  • get_next_comments_link()
• $nextpage to $previous_page in:
  • get_previous_posts_page_link()
• $prevpage to $previous_page in:
  • get_previous_comments_link()

Includes minor code layout fixes for better readability.

Follow-up to [5045], [8502], [8961], [28111].

Props dalirajab, SergeyBiryukov.
Fixes #57746.

File:

• trunk/src/wp-includes/link-template.php (modified) (11 diffs)

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

@@ -2482 +2482 @@
                         $paged = 1;
                 }
-                $nextpage = (int) $paged + 1;
-                if ( ! $max_page || $max_page >= $nextpage ) {
-                        return get_pagenum_link( $nextpage );
+
+                $next_page = (int) $paged + 1;
+
+                if ( ! $max_page || $max_page >= $next_page ) {
+                        return get_pagenum_link( $next_page );
                 }
         }
@@ -2531 +2533 @@
         }
 
-        $nextpage = (int) $paged + 1;
+        $next_page = (int) $paged + 1;
 
         if ( null === $label ) {
@@ -2537 +2539 @@
         }
 
-        if ( ! is_single() && ( $nextpage <= $max_page ) ) {
+        if ( ! is_single() && ( $next_page <= $max_page ) ) {
                 /**
                  * Filters the anchor tag attributes for the next posts page link.
@@ -2547 +2549 @@
                 $attr = apply_filters( 'next_posts_link_attributes', '' );
 
-                return '<a href="' . next_posts( $max_page, false ) . "\" $attr>" . preg_replace( '/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label ) . '</a>';
+                return sprintf(
+                        '<a href="%1$s" %2$s>%3$s</a>',
+                        next_posts( $max_page, false ),
+                        $attr,
+                        preg_replace( '/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label )
+                );
         }
 }
@@ -2580 +2587 @@
 
         if ( ! is_single() ) {
-                $nextpage = (int) $paged - 1;
-                if ( $nextpage < 1 ) {
-                        $nextpage = 1;
-                }
-                return get_pagenum_link( $nextpage );
+                $previous_page = (int) $paged - 1;
+
+                if ( $previous_page < 1 ) {
+                        $previous_page = 1;
+                }
+
+                return get_pagenum_link( $previous_page );
         }
 }
@@ -2632 +2641 @@
                  */
                 $attr = apply_filters( 'previous_posts_link_attributes', '' );
-                return '<a href="' . previous_posts( false ) . "\" $attr>" . preg_replace( '/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label ) . '</a>';
+
+                return sprintf(
+                        '<a href="%1$s" %2$s>%3$s</a>',
+                        previous_posts( false ),
+                        $attr,
+                        preg_replace( '/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label )
+                );
         }
 }
@@ -3080 +3095 @@
         }
 
-        $nextpage = (int) $page + 1;
+        $next_page = (int) $page + 1;
 
         if ( empty( $max_page ) ) {
@@ -3090 +3105 @@
         }
 
-        if ( $nextpage > $max_page ) {
+        if ( $next_page > $max_page ) {
                 return;
         }
@@ -3105 +3120 @@
          * @param string $attributes Attributes for the anchor tag.
          */
-        return '<a href="' . esc_url( get_comments_pagenum_link( $nextpage, $max_page ) ) . '" ' . apply_filters( 'next_comments_link_attributes', '' ) . '>' . preg_replace( '/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label ) . '</a>';
+        $attr = apply_filters( 'next_comments_link_attributes', '' );
+
+        return sprintf(
+                '<a href="%1$s" %2$s>%3$s</a>',
+                esc_url( get_comments_pagenum_link( $next_page, $max_page ) ),
+                $attr,
+                preg_replace( '/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label )
+        );
 }
 
@@ -3139 +3161 @@
         }
 
-        $prevpage = (int) $page - 1;
+        $previous_page = (int) $page - 1;
 
         if ( empty( $label ) ) {
@@ -3152 +3174 @@
          * @param string $attributes Attributes for the anchor tag.
          */
-        return '<a href="' . esc_url( get_comments_pagenum_link( $prevpage ) ) . '" ' . apply_filters( 'previous_comments_link_attributes', '' ) . '>' . preg_replace( '/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label ) . '</a>';
+        $attr = apply_filters( 'previous_comments_link_attributes', '' );
+
+        return sprintf(
+                '<a href="%1$s" %2$s>%3$s</a>',
+                esc_url( get_comments_pagenum_link( $previous_page ) ),
+                $attr,
+                preg_replace( '/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label )
+        );
 }