Changeset 28398 for trunk/src/wp-includes/post-template.php

Timestamp:

05/15/2014 12:43:40 AM (10 years ago)

Author:

wonderboymusic

Message:

Eliminate use of extract() in wp_link_pages().

Adds unit tests to a new file: tests/post/template.php.
There were previously no unit tests for wp_link_pages().

See #22400.

File:

• trunk/src/wp-includes/post-template.php (modified) (5 diffs)

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

@@ -740 +740 @@
     );
 
-    $r = wp_parse_args( $args, $defaults );
+    $params = wp_parse_args( $args, $defaults );
 
     /**
@@ -747 +747 @@
      * @since 3.0.0
      *
-     * @param array $r An array of arguments for page links for paginated posts.
-     */
-    $r = apply_filters( 'wp_link_pages_args', $r );
-    extract( $r, EXTR_SKIP );
+     * @param array $params An array of arguments for page links for paginated posts.
+     */
+    $r = apply_filters( 'wp_link_pages_args', $params );
 
     global $page, $numpages, $multipage, $more;
@@ -756 +755 @@
     $output = '';
     if ( $multipage ) {
-        if ( 'number' == $next_or_number ) {
-            $output .= $before;
+        if ( 'number' == $r['next_or_number'] ) {
+            $output .= $r['before'];
             for ( $i = 1; $i <= $numpages; $i++ ) {
-                $link = $link_before . str_replace( '%', $i, $pagelink ) . $link_after;
-                if ( $i != $page || ! $more && 1 == $page )
+                $link = $r['link_before'] . str_replace( '%', $i, $r['pagelink'] ) . $r['link_after'];
+                if ( $i != $page || ! $more && 1 == $page ) {
                     $link = _wp_link_page( $i ) . $link . '</a>';
-
+                }
                 /**
                  * Filter the HTML output of individual page number links.
@@ -772 +771 @@
                  */
                 $link = apply_filters( 'wp_link_pages_link', $link, $i );
-                $output .= $separator . $link;
+                $output .= $r['separator'] . $link;
             }
-            $output .= $after;
+            $output .= $r['after'];
         } elseif ( $more ) {
-            $output .= $before;
-            $i = $page - 1;
-            if ( $i ) {
-                $link = _wp_link_page( $i ) . $link_before . $previouspagelink . $link_after . '</a>';
+            $output .= $r['before'];
+            $prev = $page - 1;
+            if ( $prev ) {
+                $link = _wp_link_page( $prev ) . $r['link_before'] . $r['previouspagelink'] . $r['link_after'] . '</a>';
 
                 /** This filter is documented in wp-includes/post-template.php */
-                $link = apply_filters( 'wp_link_pages_link', $link, $i );
-                $output .= $separator . $link;
+                $link = apply_filters( 'wp_link_pages_link', $link, $prev );
+                $output .= $r['separator'] . $link;
             }
-            $i = $page + 1;
-            if ( $i <= $numpages ) {
-                $link = _wp_link_page( $i ) . $link_before . $nextpagelink . $link_after . '</a>';
+            $next = $page + 1;
+            if ( $next <= $numpages ) {
+                $link = _wp_link_page( $next ) . $r['link_before'] . $r['nextpagelink'] . $r['link_after'] . '</a>';
 
                 /** This filter is documented in wp-includes/post-template.php */
-                $link = apply_filters( 'wp_link_pages_link', $link, $i );
-                $output .= $separator . $link;
+                $link = apply_filters( 'wp_link_pages_link', $link, $next );
+                $output .= $r['separator'] . $link;
             }
-            $output .= $after;
+            $output .= $r['after'];
         }
     }
@@ -802 +801 @@
      * @since 3.6.0
      *
-     * @param string $output HTML output of paginated posts' page links.
+     * @param string $html HTML output of paginated posts' page links.
      * @param array  $args   An array of arguments.
      */
-    $output = apply_filters( 'wp_link_pages', $output, $args );
-
-    if ( $echo )
-        echo $output;
-
-    return $output;
+    $html = apply_filters( 'wp_link_pages', $output, $args );
+
+    if ( $r['echo'] ) {
+        echo $html;
+    }
+    return $html;
 }