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

Timestamp:

02/12/2015 01:38:26 AM (6 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].

File:

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

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();