Changeset 31432

Timestamp:

02/12/2015 01:38:26 AM (10 years ago)

Author:

dd32

Message:

Avoid a PHP Warning when add_args is passed as false to paginate_links().

Props boonebgorges for the unit test.
See #30831 [31203].

Location:

trunk

Files:

• src/wp-includes/general-template.php (modified) (2 diffs)
• tests/phpunit/tests/general/paginateLinks.php (modified) (1 diff)

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

@@ -2620 +2620 @@
     $args = wp_parse_args( $args, $defaults );
 
+    if ( ! is_array( $args['add_args'] ) ) {
+        $args['add_args'] = array();
+    }
+
     // Merge additional query vars found in the original URL into 'add_args' array.
     if ( isset( $url_parts[1] ) ) {
@@ -2645 +2649 @@
         $mid_size = 2;
     }
-    $add_args = is_array( $args['add_args'] ) ? $args['add_args'] : false;
+    $add_args = $args['add_args'];
     $r = '';
     $page_links = array();

trunk/tests/phpunit/tests/general/paginateLinks.php

@@ -292 +292 @@
         $_SERVER['REQUEST_URI'] = $request_uri;
     }
+
+    /**
+     * @ticket 30831
+     */
+    public function test_paginate_links_should_allow_add_args_to_be_bool_false() {
+        // Fake the query params.
+        $request_uri = $_SERVER['REQUEST_URI'];
+        $_SERVER['REQUEST_URI'] = add_query_arg( 'foo', 3, home_url() );
+
+        $links = paginate_links( array(
+            'add_args' => false,
+            'base'    => add_query_arg( 'foo', '%#%' ),
+            'format'  => '',
+            'total'   => 5,
+            'current' => 3,
+            'type'    => 'array',
+        ) );
+
+        $this->assertContains( "<span class='page-numbers current'>3</span>", $links );
+    }
 }