Changeset 45667

Timestamp:

07/25/2019 12:47:53 AM (7 years ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Rename $r variable used with wp_parse_args() to $parsed_args for clarity.

Props freewebmentor.
Fixes #45059.

Location:

trunk/src

Files:

• wp-admin/includes/bookmark.php (modified) (2 diffs)
• wp-admin/includes/media.php (modified) (6 diffs)
• wp-admin/includes/meta-boxes.php (modified) (3 diffs)
• wp-admin/includes/ms.php (modified) (4 diffs)
• wp-admin/includes/template.php (modified) (9 diffs)
• wp-includes/bookmark-template.php (modified) (12 diffs)
• wp-includes/bookmark.php (modified) (12 diffs)
• wp-includes/category-template.php (modified) (10 diffs)
• wp-includes/class-http.php (modified) (14 diffs)
• wp-includes/class-wp-ajax-response.php (modified) (2 diffs)
• wp-includes/class-wp-http-curl.php (modified) (15 diffs)
• wp-includes/class-wp-http-streams.php (modified) (15 diffs)
• wp-includes/comment-template.php (modified) (9 diffs)
• wp-includes/comment.php (modified) (1 diff)
• wp-includes/deprecated.php (modified) (3 diffs)
• wp-includes/functions.php (modified) (19 diffs)
• wp-includes/general-template.php (modified) (11 diffs)
• wp-includes/post-template.php (modified) (15 diffs)
• wp-includes/post.php (modified) (15 diffs)
• wp-includes/taxonomy.php (modified) (1 diff)
• wp-includes/user.php (modified) (7 diffs)

trunk/src/wp-admin/includes/bookmark.php

@@ -163 +163 @@
         );
 
-        $args = wp_parse_args( $linkdata, $defaults );
-        $r    = wp_unslash( sanitize_bookmark( $args, 'db' ) );
-
-        $link_id   = $r['link_id'];
-        $link_name = $r['link_name'];
-        $link_url  = $r['link_url'];
+        $parsed_args = wp_parse_args( $linkdata, $defaults );
+        $parsed_args = wp_unslash( sanitize_bookmark( $parsed_args, 'db' ) );
+
+        $link_id   = $parsed_args['link_id'];
+        $link_name = $parsed_args['link_name'];
+        $link_url  = $parsed_args['link_url'];
 
         $update = false;
@@ -187 +187 @@
         }
 
-        $link_rating      = ( ! empty( $r['link_rating'] ) ) ? $r['link_rating'] : 0;
-        $link_image       = ( ! empty( $r['link_image'] ) ) ? $r['link_image'] : '';
-        $link_target      = ( ! empty( $r['link_target'] ) ) ? $r['link_target'] : '';
-        $link_visible     = ( ! empty( $r['link_visible'] ) ) ? $r['link_visible'] : 'Y';
-        $link_owner       = ( ! empty( $r['link_owner'] ) ) ? $r['link_owner'] : get_current_user_id();
-        $link_notes       = ( ! empty( $r['link_notes'] ) ) ? $r['link_notes'] : '';
-        $link_description = ( ! empty( $r['link_description'] ) ) ? $r['link_description'] : '';
-        $link_rss         = ( ! empty( $r['link_rss'] ) ) ? $r['link_rss'] : '';
-        $link_rel         = ( ! empty( $r['link_rel'] ) ) ? $r['link_rel'] : '';
-        $link_category    = ( ! empty( $r['link_category'] ) ) ? $r['link_category'] : array();
+        $link_rating      = ( ! empty( $parsed_args['link_rating'] ) ) ? $parsed_args['link_rating'] : 0;
+        $link_image       = ( ! empty( $parsed_args['link_image'] ) ) ? $parsed_args['link_image'] : '';
+        $link_target      = ( ! empty( $parsed_args['link_target'] ) ) ? $parsed_args['link_target'] : '';
+        $link_visible     = ( ! empty( $parsed_args['link_visible'] ) ) ? $parsed_args['link_visible'] : 'Y';
+        $link_owner       = ( ! empty( $parsed_args['link_owner'] ) ) ? $parsed_args['link_owner'] : get_current_user_id();
+        $link_notes       = ( ! empty( $parsed_args['link_notes'] ) ) ? $parsed_args['link_notes'] : '';
+        $link_description = ( ! empty( $parsed_args['link_description'] ) ) ? $parsed_args['link_description'] : '';
+        $link_rss         = ( ! empty( $parsed_args['link_rss'] ) ) ? $parsed_args['link_rss'] : '';
+        $link_rel         = ( ! empty( $parsed_args['link_rel'] ) ) ? $parsed_args['link_rel'] : '';
+        $link_category    = ( ! empty( $parsed_args['link_category'] ) ) ? $parsed_args['link_category'] : array();
 
         // Make sure we set a valid category.

trunk/src/wp-admin/includes/media.php

@@ -1494 +1494 @@
                 'show_title' => true,
         );
-        $args         = wp_parse_args( $args, $default_args );
+
+        $parsed_args = wp_parse_args( $args, $default_args );
 
         /**
@@ -1503 +1504 @@
          * @see get_media_item
          *
-         * @param array $args An array of arguments.
+         * @param array $parsed_args An array of arguments.
          */
-        $r = apply_filters( 'get_media_item_args', $args );
+        $parsed_args = apply_filters( 'get_media_item_args', $parsed_args );
 
         $toggle_on  = __( 'Show' );
@@ -1519 +1520 @@
         $type_html       = "<input type='hidden' id='type-of-$attachment_id' value='" . esc_attr( $type ) . "' />";
 
-        $form_fields = get_attachment_fields_to_edit( $post, $r['errors'] );
-
-        if ( $r['toggle'] ) {
-                $class        = empty( $r['errors'] ) ? 'startclosed' : 'startopen';
+        $form_fields = get_attachment_fields_to_edit( $post, $parsed_args['errors'] );
+
+        if ( $parsed_args['toggle'] ) {
+                $class        = empty( $parsed_args['errors'] ) ? 'startclosed' : 'startopen';
                 $toggle_links = "
         <a class='toggle describe-toggle-on' href='#'>$toggle_on</a>
@@ -1532 +1533 @@
 
         $display_title = ( ! empty( $title ) ) ? $title : $filename; // $title shouldn't ever be empty, but just in case
-        $display_title = $r['show_title'] ? "<div class='filename new'><span class='title'>" . wp_html_excerpt( $display_title, 60, '&hellip;' ) . '</span></div>' : '';
+        $display_title = $parsed_args['show_title'] ? "<div class='filename new'><span class='title'>" . wp_html_excerpt( $display_title, 60, '&hellip;' ) . '</span></div>' : '';
 
         $gallery = ( ( isset( $_REQUEST['tab'] ) && 'gallery' == $_REQUEST['tab'] ) || ( isset( $redir_tab ) && 'gallery' == $redir_tab ) );
@@ -1610 +1611 @@
         );
 
-        if ( $r['send'] ) {
-                $r['send'] = get_submit_button( __( 'Insert into Post' ), '', "send[$attachment_id]", false );
-        }
-
-        $delete = empty( $r['delete'] ) ? '' : $r['delete'];
+        if ( $parsed_args['send'] ) {
+                $parsed_args['send'] = get_submit_button( __( 'Insert into Post' ), '', "send[$attachment_id]", false );
+        }
+
+        $delete = empty( $parsed_args['delete'] ) ? '' : $parsed_args['delete'];
         if ( $delete && current_user_can( 'delete_post', $attachment_id ) ) {
                 if ( ! EMPTY_TRASH_DAYS ) {
@@ -1651 +1652 @@
         }
 
-        if ( ( $r['send'] || $thumbnail || $delete ) && ! isset( $form_fields['buttons'] ) ) {
-                $form_fields['buttons'] = array( 'tr' => "\t\t<tr class='submit'><td></td><td class='savesend'>" . $r['send'] . " $thumbnail $delete</td></tr>\n" );
+        if ( ( $parsed_args['send'] || $thumbnail || $delete ) && ! isset( $form_fields['buttons'] ) ) {
+                $form_fields['buttons'] = array( 'tr' => "\t\t<tr class='submit'><td></td><td class='savesend'>" . $parsed_args['send'] . " $thumbnail $delete</td></tr>\n" );
         }
         $hidden_fields = array();

trunk/src/wp-admin/includes/meta-boxes.php

@@ -493 +493 @@
                 $args = $box['args'];
         }
-        $r                     = wp_parse_args( $args, $defaults );
-        $tax_name              = esc_attr( $r['taxonomy'] );
-        $taxonomy              = get_taxonomy( $r['taxonomy'] );
+        $parsed_args           = wp_parse_args( $args, $defaults );
+        $tax_name              = esc_attr( $parsed_args['taxonomy'] );
+        $taxonomy              = get_taxonomy( $parsed_args['taxonomy'] );
         $user_can_assign_terms = current_user_can( $taxonomy->cap->assign_terms );
         $comma                 = _x( ',', 'tag delimiter' );
@@ -556 +556 @@
                 $args = $box['args'];
         }
-        $r        = wp_parse_args( $args, $defaults );
-        $tax_name = esc_attr( $r['taxonomy'] );
-        $taxonomy = get_taxonomy( $r['taxonomy'] );
+        $parsed_args = wp_parse_args( $args, $defaults );
+        $tax_name    = esc_attr( $parsed_args['taxonomy'] );
+        $taxonomy    = get_taxonomy( $parsed_args['taxonomy'] );
         ?>
         <div id="taxonomy-<?php echo $tax_name; ?>" class="categorydiv">
@@ -1311 +1311 @@
                 <td><select name="link_rating" id="link_rating" size="1">
                 <?php
-                for ( $r = 0; $r <= 10; $r++ ) {
-                        echo '<option value="' . $r . '"';
-                        if ( isset( $link->link_rating ) && $link->link_rating == $r ) {
+                for ( $parsed_args = 0; $parsed_args <= 10; $parsed_args++ ) {
+                        echo '<option value="' . $parsed_args . '"';
+                        if ( isset( $link->link_rating ) && $link->link_rating == $parsed_args ) {
                                 echo ' selected="selected"';
                         }
-                        echo( '>' . $r . '</option>' );
+                        echo( '>' . $parsed_args . '</option>' );
                 }
                 ?>

trunk/src/wp-admin/includes/ms.php

@@ -1090 +1090 @@
 
         // Parse arguments
-        $r = wp_parse_args(
+        $parsed_args = wp_parse_args(
                 $args,
                 array(
@@ -1103 +1103 @@
 
         // Loop through tabs
-        foreach ( $r['links'] as $link_id => $link ) {
+        foreach ( $parsed_args['links'] as $link_id => $link ) {
 
                 // Skip link if user can't access
-                if ( ! current_user_can( $link['cap'], $r['blog_id'] ) ) {
+                if ( ! current_user_can( $link['cap'], $parsed_args['blog_id'] ) ) {
                         continue;
                 }
@@ -1117 +1117 @@
 
                 // Selected is set by the parent OR assumed by the $pagenow global
-                if ( $r['selected'] === $link_id || $link['url'] === $GLOBALS['pagenow'] ) {
+                if ( $parsed_args['selected'] === $link_id || $link['url'] === $GLOBALS['pagenow'] ) {
                         $classes[]    = 'nav-tab-active';
                         $aria_current = ' aria-current="page"';
@@ -1126 +1126 @@
 
                 // Get the URL for this link
-                $url = add_query_arg( array( 'id' => $r['blog_id'] ), network_admin_url( $link['url'] ) );
+                $url = add_query_arg( array( 'id' => $parsed_args['blog_id'] ), network_admin_url( $link['url'] ) );
 
                 // Add link to nav links

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

@@ -101 +101 @@
         $params = apply_filters( 'wp_terms_checklist_args', $args, $post_id );
 
-        $r = wp_parse_args( $params, $defaults );
-
-        if ( empty( $r['walker'] ) || ! ( $r['walker'] instanceof Walker ) ) {
+        $parsed_args = wp_parse_args( $params, $defaults );
+
+        if ( empty( $parsed_args['walker'] ) || ! ( $parsed_args['walker'] instanceof Walker ) ) {
                 $walker = new Walker_Category_Checklist;
         } else {
-                $walker = $r['walker'];
-        }
-
-        $taxonomy             = $r['taxonomy'];
-        $descendants_and_self = (int) $r['descendants_and_self'];
+                $walker = $parsed_args['walker'];
+        }
+
+        $taxonomy             = $parsed_args['taxonomy'];
+        $descendants_and_self = (int) $parsed_args['descendants_and_self'];
 
         $args = array( 'taxonomy' => $taxonomy );
@@ -117 +117 @@
         $args['disabled'] = ! current_user_can( $tax->cap->assign_terms );
 
-        $args['list_only'] = ! empty( $r['list_only'] );
-
-        if ( is_array( $r['selected_cats'] ) ) {
-                $args['selected_cats'] = $r['selected_cats'];
+        $args['list_only'] = ! empty( $parsed_args['list_only'] );
+
+        if ( is_array( $parsed_args['selected_cats'] ) ) {
+                $args['selected_cats'] = $parsed_args['selected_cats'];
         } elseif ( $post_id ) {
                 $args['selected_cats'] = wp_get_object_terms( $post_id, $taxonomy, array_merge( $args, array( 'fields' => 'ids' ) ) );
@@ -126 +126 @@
                 $args['selected_cats'] = array();
         }
-        if ( is_array( $r['popular_cats'] ) ) {
-                $args['popular_cats'] = $r['popular_cats'];
+        if ( is_array( $parsed_args['popular_cats'] ) ) {
+                $args['popular_cats'] = $parsed_args['popular_cats'];
         } else {
                 $args['popular_cats'] = get_terms(
@@ -157 +157 @@
         $output = '';
 
-        if ( $r['checked_ontop'] ) {
+        if ( $parsed_args['checked_ontop'] ) {
                 // Post process $categories rather than adding an exclude to the get_terms() query to keep the query the same across all posts (for any query cache)
                 $checked_categories = array();
@@ -175 +175 @@
         $output .= call_user_func_array( array( $walker, 'walk' ), array( $categories, 0, $args ) );
 
-        if ( $r['echo'] ) {
+        if ( $parsed_args['echo'] ) {
                 echo $output;
         }
@@ -2442 +2442 @@
  */
 function wp_star_rating( $args = array() ) {
-        $defaults = array(
+        $defaults    = array(
                 'rating' => 0,
                 'type'   => 'rating',
@@ -2448 +2448 @@
                 'echo'   => true,
         );
-        $r        = wp_parse_args( $args, $defaults );
+        $parsed_args = wp_parse_args( $args, $defaults );
 
         // Non-English decimal places when the $rating is coming from a string
-        $rating = (float) str_replace( ',', '.', $r['rating'] );
+        $rating = (float) str_replace( ',', '.', $parsed_args['rating'] );
 
         // Convert Percentage to star rating, 0..5 in .5 increments
-        if ( 'percent' === $r['type'] ) {
+        if ( 'percent' === $parsed_args['type'] ) {
                 $rating = round( $rating / 10, 0 ) / 2;
         }
@@ -2463 +2463 @@
         $empty_stars = 5 - $full_stars - $half_stars;
 
-        if ( $r['number'] ) {
+        if ( $parsed_args['number'] ) {
                 /* translators: 1: the rating, 2: the number of ratings */
-                $format = _n( '%1$s rating based on %2$s rating', '%1$s rating based on %2$s ratings', $r['number'] );
-                $title  = sprintf( $format, number_format_i18n( $rating, 1 ), number_format_i18n( $r['number'] ) );
+                $format = _n( '%1$s rating based on %2$s rating', '%1$s rating based on %2$s ratings', $parsed_args['number'] );
+                $title  = sprintf( $format, number_format_i18n( $rating, 1 ), number_format_i18n( $parsed_args['number'] ) );
         } else {
                 /* translators: %s: the rating */
@@ -2479 +2479 @@
         $output .= '</div>';
 
-        if ( $r['echo'] ) {
+        if ( $parsed_args['echo'] ) {
                 echo $output;
         }

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

@@ -63 +63 @@
         );
 
-        $r = wp_parse_args( $args, $defaults );
+        $parsed_args = wp_parse_args( $args, $defaults );
 
         $output = ''; // Blank string to start with.
@@ -71 +71 @@
                         $bookmark->recently_updated = false;
                 }
-                $output .= $r['before'];
-                if ( $r['show_updated'] && $bookmark->recently_updated ) {
+                $output .= $parsed_args['before'];
+                if ( $parsed_args['show_updated'] && $bookmark->recently_updated ) {
                         $output .= '<em>';
                 }
@@ -83 +83 @@
                 $title = $desc;
 
-                if ( $r['show_updated'] ) {
+                if ( $parsed_args['show_updated'] ) {
                         if ( '00' != substr( $bookmark->link_updated_f, 0, 2 ) ) {
                                 $title .= ' (';
@@ -96 +96 @@
                         }
                 }
-                $alt = ' alt="' . $name . ( $r['show_description'] ? ' ' . $title : '' ) . '"';
+                $alt = ' alt="' . $name . ( $parsed_args['show_description'] ? ' ' . $title : '' ) . '"';
 
                 if ( '' != $title ) {
@@ -111 +111 @@
                 $output .= '<a href="' . $the_link . '"' . $rel . $title . $target . '>';
 
-                $output .= $r['link_before'];
-
-                if ( $bookmark->link_image != null && $r['show_images'] ) {
+                $output .= $parsed_args['link_before'];
+
+                if ( $bookmark->link_image != null && $parsed_args['show_images'] ) {
                         if ( strpos( $bookmark->link_image, 'http' ) === 0 ) {
                                 $output .= "<img src=\"$bookmark->link_image\" $alt $title />";
@@ -119 +119 @@
                                 $output .= '<img src="' . get_option( 'siteurl' ) . "$bookmark->link_image\" $alt $title />";
                         }
-                        if ( $r['show_name'] ) {
+                        if ( $parsed_args['show_name'] ) {
                                 $output .= " $name";
                         }
@@ -126 +126 @@
                 }
 
-                $output .= $r['link_after'];
+                $output .= $parsed_args['link_after'];
 
                 $output .= '</a>';
 
-                if ( $r['show_updated'] && $bookmark->recently_updated ) {
+                if ( $parsed_args['show_updated'] && $bookmark->recently_updated ) {
                         $output .= '</em>';
                 }
 
-                if ( $r['show_description'] && '' != $desc ) {
-                        $output .= $r['between'] . $desc;
-                }
-
-                if ( $r['show_rating'] ) {
-                        $output .= $r['between'] . sanitize_bookmark_field(
+                if ( $parsed_args['show_description'] && '' != $desc ) {
+                        $output .= $parsed_args['between'] . $desc;
+                }
+
+                if ( $parsed_args['show_rating'] ) {
+                        $output .= $parsed_args['between'] . sanitize_bookmark_field(
                                 'link_rating',
                                 $bookmark->link_rating,
@@ -146 +146 @@
                         );
                 }
-                $output .= $r['after'] . "\n";
+                $output .= $parsed_args['after'] . "\n";
         } // end while
 
@@ -226 +226 @@
         );
 
-        $r = wp_parse_args( $args, $defaults );
+        $parsed_args = wp_parse_args( $args, $defaults );
 
         $output = '';
 
-        if ( ! is_array( $r['class'] ) ) {
-                $r['class'] = explode( ' ', $r['class'] );
+        if ( ! is_array( $parsed_args['class'] ) ) {
+                $parsed_args['class'] = explode( ' ', $parsed_args['class'] );
         }
-        $r['class'] = array_map( 'sanitize_html_class', $r['class'] );
-        $r['class'] = trim( join( ' ', $r['class'] ) );
-
-        if ( $r['categorize'] ) {
+        $parsed_args['class'] = array_map( 'sanitize_html_class', $parsed_args['class'] );
+        $parsed_args['class'] = trim( join( ' ', $parsed_args['class'] ) );
+
+        if ( $parsed_args['categorize'] ) {
                 $cats = get_terms(
                         'link_category',
                         array(
-                                'name__like'   => $r['category_name'],
-                                'include'      => $r['category'],
-                                'exclude'      => $r['exclude_category'],
-                                'orderby'      => $r['category_orderby'],
-                                'order'        => $r['category_order'],
+                                'name__like'   => $parsed_args['category_name'],
+                                'include'      => $parsed_args['category'],
+                                'exclude'      => $parsed_args['exclude_category'],
+                                'orderby'      => $parsed_args['category_orderby'],
+                                'order'        => $parsed_args['category_order'],
                                 'hierarchical' => 0,
                         )
                 );
                 if ( empty( $cats ) ) {
-                        $r['categorize'] = false;
+                        $parsed_args['categorize'] = false;
                 }
         }
 
-        if ( $r['categorize'] ) {
+        if ( $parsed_args['categorize'] ) {
                 // Split the bookmarks into ul's for each category
                 foreach ( (array) $cats as $cat ) {
-                        $params    = array_merge( $r, array( 'category' => $cat->term_id ) );
+                        $params    = array_merge( $parsed_args, array( 'category' => $cat->term_id ) );
                         $bookmarks = get_bookmarks( $params );
                         if ( empty( $bookmarks ) ) {
@@ -263 +263 @@
                         $output .= str_replace(
                                 array( '%id', '%class' ),
-                                array( "linkcat-$cat->term_id", $r['class'] ),
-                                $r['category_before']
+                                array( "linkcat-$cat->term_id", $parsed_args['class'] ),
+                                $parsed_args['category_before']
                         );
                         /**
@@ -275 +275 @@
                         $catname = apply_filters( 'link_category', $cat->name );
 
-                        $output .= $r['title_before'];
+                        $output .= $parsed_args['title_before'];
                         $output .= $catname;
-                        $output .= $r['title_after'];
+                        $output .= $parsed_args['title_after'];
                         $output .= "\n\t<ul class='xoxo blogroll'>\n";
-                        $output .= _walk_bookmarks( $bookmarks, $r );
+                        $output .= _walk_bookmarks( $bookmarks, $parsed_args );
                         $output .= "\n\t</ul>\n";
-                        $output .= $r['category_after'] . "\n";
+                        $output .= $parsed_args['category_after'] . "\n";
                 }
         } else {
                 //output one single list using title_li for the title
-                $bookmarks = get_bookmarks( $r );
+                $bookmarks = get_bookmarks( $parsed_args );
 
                 if ( ! empty( $bookmarks ) ) {
-                        if ( ! empty( $r['title_li'] ) ) {
+                        if ( ! empty( $parsed_args['title_li'] ) ) {
                                 $output .= str_replace(
                                         array( '%id', '%class' ),
-                                        array( 'linkcat-' . $r['category'], $r['class'] ),
-                                        $r['category_before']
+                                        array( 'linkcat-' . $parsed_args['category'], $parsed_args['class'] ),
+                                        $parsed_args['category_before']
                                 );
-                                $output .= $r['title_before'];
-                                $output .= $r['title_li'];
-                                $output .= $r['title_after'];
+                                $output .= $parsed_args['title_before'];
+                                $output .= $parsed_args['title_li'];
+                                $output .= $parsed_args['title_after'];
                                 $output .= "\n\t<ul class='xoxo blogroll'>\n";
-                                $output .= _walk_bookmarks( $bookmarks, $r );
+                                $output .= _walk_bookmarks( $bookmarks, $parsed_args );
                                 $output .= "\n\t</ul>\n";
-                                $output .= $r['category_after'] . "\n";
+                                $output .= $parsed_args['category_after'] . "\n";
                         } else {
-                                $output .= _walk_bookmarks( $bookmarks, $r );
+                                $output .= _walk_bookmarks( $bookmarks, $parsed_args );
                         }
                 }
@@ -316 +316 @@
         $html = apply_filters( 'wp_list_bookmarks', $output );
 
-        if ( ! $r['echo'] ) {
+        if ( ! $parsed_args['echo'] ) {
                 return $html;
         }

trunk/src/wp-includes/bookmark.php

@@ -140 +140 @@
         );
 
-        $r = wp_parse_args( $args, $defaults );
-
-        $key   = md5( serialize( $r ) );
+        $parsed_args = wp_parse_args( $args, $defaults );
+
+        $key   = md5( serialize( $parsed_args ) );
         $cache = wp_cache_get( 'get_bookmarks', 'bookmark' );
-        if ( 'rand' !== $r['orderby'] && $cache ) {
+
+        if ( 'rand' !== $parsed_args['orderby'] && $cache ) {
                 if ( is_array( $cache ) && isset( $cache[ $key ] ) ) {
                         $bookmarks = $cache[ $key ];
@@ -160 +161 @@
                          *
                          * @param array $bookmarks List of the cached bookmarks.
-                         * @param array $r         An array of bookmark query arguments.
+                         * @param array $parsed_args         An array of bookmark query arguments.
                          */
-                        return apply_filters( 'get_bookmarks', $bookmarks, $r );
+                        return apply_filters( 'get_bookmarks', $bookmarks, $parsed_args );
                 }
         }
@@ -171 +172 @@
 
         $inclusions = '';
-        if ( ! empty( $r['include'] ) ) {
-                $r['exclude']       = '';  //ignore exclude, category, and category_name params if using include
-                $r['category']      = '';
-                $r['category_name'] = '';
-                $inclinks           = wp_parse_id_list( $r['include'] );
+        if ( ! empty( $parsed_args['include'] ) ) {
+                $parsed_args['exclude']       = '';  //ignore exclude, category, and category_name params if using include
+                $parsed_args['category']      = '';
+                $parsed_args['category_name'] = '';
+
+                $inclinks = wp_parse_id_list( $parsed_args['include'] );
                 if ( count( $inclinks ) ) {
                         foreach ( $inclinks as $inclink ) {
@@ -191 +193 @@
 
         $exclusions = '';
-        if ( ! empty( $r['exclude'] ) ) {
-                $exlinks = wp_parse_id_list( $r['exclude'] );
+        if ( ! empty( $parsed_args['exclude'] ) ) {
+                $exlinks = wp_parse_id_list( $parsed_args['exclude'] );
                 if ( count( $exlinks ) ) {
                         foreach ( $exlinks as $exlink ) {
@@ -207 +209 @@
         }
 
-        if ( ! empty( $r['category_name'] ) ) {
-                $r['category'] = get_term_by( 'name', $r['category_name'], 'link_category' );
-                if ( $r['category'] ) {
-                        $r['category'] = $r['category']->term_id;
+        if ( ! empty( $parsed_args['category_name'] ) ) {
+                $parsed_args['category'] = get_term_by( 'name', $parsed_args['category_name'], 'link_category' );
+                if ( $parsed_args['category'] ) {
+                        $parsed_args['category'] = $parsed_args['category']->term_id;
                 } else {
                         $cache[ $key ] = array();
                         wp_cache_set( 'get_bookmarks', $cache, 'bookmark' );
                         /** This filter is documented in wp-includes/bookmark.php */
-                        return apply_filters( 'get_bookmarks', array(), $r );
+                        return apply_filters( 'get_bookmarks', array(), $parsed_args );
                 }
         }
 
         $search = '';
-        if ( ! empty( $r['search'] ) ) {
-                $like   = '%' . $wpdb->esc_like( $r['search'] ) . '%';
+        if ( ! empty( $parsed_args['search'] ) ) {
+                $like   = '%' . $wpdb->esc_like( $parsed_args['search'] ) . '%';
                 $search = $wpdb->prepare( ' AND ( (link_url LIKE %s) OR (link_name LIKE %s) OR (link_description LIKE %s) ) ', $like, $like, $like );
         }
@@ -227 +229 @@
         $category_query = '';
         $join           = '';
-        if ( ! empty( $r['category'] ) ) {
-                $incategories = wp_parse_id_list( $r['category'] );
+        if ( ! empty( $parsed_args['category'] ) ) {
+                $incategories = wp_parse_id_list( $parsed_args['category'] );
                 if ( count( $incategories ) ) {
                         foreach ( $incategories as $incat ) {
@@ -244 +246 @@
         }
 
-        if ( $r['show_updated'] ) {
+        if ( $parsed_args['show_updated'] ) {
                 $recently_updated_test = ', IF (DATE_ADD(link_updated, INTERVAL 120 MINUTE) >= NOW(), 1,0) as recently_updated ';
         } else {
@@ -250 +252 @@
         }
 
-        $get_updated = ( $r['show_updated'] ) ? ', UNIX_TIMESTAMP(link_updated) AS link_updated_f ' : '';
-
-        $orderby = strtolower( $r['orderby'] );
+        $get_updated = ( $parsed_args['show_updated'] ) ? ', UNIX_TIMESTAMP(link_updated) AS link_updated_f ' : '';
+
+        $orderby = strtolower( $parsed_args['orderby'] );
         $length  = '';
         switch ( $orderby ) {
@@ -283 +285 @@
         }
 
-        $order = strtoupper( $r['order'] );
+        $order = strtoupper( $parsed_args['order'] );
         if ( '' !== $order && ! in_array( $order, array( 'ASC', 'DESC' ) ) ) {
                 $order = 'ASC';
@@ -289 +291 @@
 
         $visible = '';
-        if ( $r['hide_invisible'] ) {
+        if ( $parsed_args['hide_invisible'] ) {
                 $visible = "AND link_visible = 'Y'";
         }
@@ -296 +298 @@
         $query .= " $exclusions $inclusions $search";
         $query .= " ORDER BY $orderby $order";
-        if ( $r['limit'] != -1 ) {
-                $query .= ' LIMIT ' . $r['limit'];
+        if ( $parsed_args['limit'] != -1 ) {
+                $query .= ' LIMIT ' . $parsed_args['limit'];
         }
 
@@ -308 +310 @@
 
         /** This filter is documented in wp-includes/bookmark.php */
-        return apply_filters( 'get_bookmarks', $results, $r );
+        return apply_filters( 'get_bookmarks', $results, $parsed_args );
 }
 

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

@@ -366 +366 @@
         }
 
-        $r                 = wp_parse_args( $args, $defaults );
-        $option_none_value = $r['option_none_value'];
-
-        if ( ! isset( $r['pad_counts'] ) && $r['show_count'] && $r['hierarchical'] ) {
-                $r['pad_counts'] = true;
-        }
-
-        $tab_index = $r['tab_index'];
+        // Parse incoming $args into an array and merge it with $defaults
+        $parsed_args       = wp_parse_args( $args, $defaults );
+        $option_none_value = $args['option_none_value'];
+
+        if ( ! isset( $parsed_args['pad_counts'] ) && $parsed_args['show_count'] && $parsed_args['hierarchical'] ) {
+                $parsed_args['pad_counts'] = true;
+        }
+
+        $tab_index = $parsed_args['tab_index'];
 
         $tab_index_attribute = '';
@@ -381 +382 @@
 
         // Avoid clashes with the 'name' param of get_terms().
-        $get_terms_args = $r;
+        $get_terms_args = $parsed_args;
         unset( $get_terms_args['name'] );
-        $categories = get_terms( $r['taxonomy'], $get_terms_args );
-
-        $name     = esc_attr( $r['name'] );
-        $class    = esc_attr( $r['class'] );
-        $id       = $r['id'] ? esc_attr( $r['id'] ) : $name;
-        $required = $r['required'] ? 'required' : '';
-
-        if ( ! $r['hide_if_empty'] || ! empty( $categories ) ) {
+        $categories = get_terms( $parsed_args['taxonomy'], $get_terms_args );
+
+        $name     = esc_attr( $parsed_args['name'] );
+        $class    = esc_attr( $parsed_args['class'] );
+        $id       = $parsed_args['id'] ? esc_attr( $parsed_args['id'] ) : $name;
+        $required = $parsed_args['required'] ? 'required' : '';
+
+        if ( ! $parsed_args['hide_if_empty'] || ! empty( $categories ) ) {
                 $output = "<select $required name='$name' id='$id' class='$class' $tab_index_attribute>\n";
         } else {
                 $output = '';
         }
-        if ( empty( $categories ) && ! $r['hide_if_empty'] && ! empty( $r['show_option_none'] ) ) {
+        if ( empty( $categories ) && ! $parsed_args['hide_if_empty'] && ! empty( $parsed_args['show_option_none'] ) ) {
 
                 /**
@@ -412 +413 @@
                  * @param WP_Term|null $category The category object, or null if there's no corresponding category.
                  */
-                $show_option_none = apply_filters( 'list_cats', $r['show_option_none'], null );
+                $show_option_none = apply_filters( 'list_cats', $parsed_args['show_option_none'], null );
                 $output          .= "\t<option value='" . esc_attr( $option_none_value ) . "' selected='selected'>$show_option_none</option>\n";
         }
@@ -418 +419 @@
         if ( ! empty( $categories ) ) {
 
-                if ( $r['show_option_all'] ) {
+                if ( $parsed_args['show_option_all'] ) {
 
                         /** This filter is documented in wp-includes/category-template.php */
-                        $show_option_all = apply_filters( 'list_cats', $r['show_option_all'], null );
-                        $selected        = ( '0' === strval( $r['selected'] ) ) ? " selected='selected'" : '';
+                        $show_option_all = apply_filters( 'list_cats', $parsed_args['show_option_all'], null );
+                        $selected        = ( '0' === strval( $parsed_args['selected'] ) ) ? " selected='selected'" : '';
                         $output         .= "\t<option value='0'$selected>$show_option_all</option>\n";
                 }
 
-                if ( $r['show_option_none'] ) {
+                if ( $parsed_args['show_option_none'] ) {
 
                         /** This filter is documented in wp-includes/category-template.php */
-                        $show_option_none = apply_filters( 'list_cats', $r['show_option_none'], null );
-                        $selected         = selected( $option_none_value, $r['selected'], false );
+                        $show_option_none = apply_filters( 'list_cats', $parsed_args['show_option_none'], null );
+                        $selected         = selected( $option_none_value, $parsed_args['selected'], false );
                         $output          .= "\t<option value='" . esc_attr( $option_none_value ) . "'$selected>$show_option_none</option>\n";
                 }
 
-                if ( $r['hierarchical'] ) {
-                        $depth = $r['depth'];  // Walk the full depth.
+                if ( $parsed_args['hierarchical'] ) {
+                        $depth = $parsed_args['depth'];  // Walk the full depth.
                 } else {
                         $depth = -1; // Flat.
                 }
-                $output .= walk_category_dropdown_tree( $categories, $depth, $r );
-        }
-
-        if ( ! $r['hide_if_empty'] || ! empty( $categories ) ) {
+                $output .= walk_category_dropdown_tree( $categories, $depth, $parsed_args );
+        }
+
+        if ( ! $parsed_args['hide_if_empty'] || ! empty( $categories ) ) {
                 $output .= "</select>\n";
         }
@@ -451 +452 @@
          *
          * @param string $output HTML output.
-         * @param array  $r      Arguments used to build the drop-down.
+         * @param array  $parsed_args      Arguments used to build the drop-down.
          */
-        $output = apply_filters( 'wp_dropdown_cats', $output, $r );
-
-        if ( $r['echo'] ) {
+        $output = apply_filters( 'wp_dropdown_cats', $output, $parsed_args );
+
+        if ( $parsed_args['echo'] ) {
                 echo $output;
         }
@@ -538 +539 @@
         );
 
-        $r = wp_parse_args( $args, $defaults );
-
-        if ( ! isset( $r['pad_counts'] ) && $r['show_count'] && $r['hierarchical'] ) {
-                $r['pad_counts'] = true;
+        $parsed_args = wp_parse_args( $args, $defaults );
+
+        if ( ! isset( $parsed_args['pad_counts'] ) && $parsed_args['show_count'] && $parsed_args['hierarchical'] ) {
+                $parsed_args['pad_counts'] = true;
         }
 
         // Descendants of exclusions should be excluded too.
-        if ( true == $r['hierarchical'] ) {
+        if ( true == $parsed_args['hierarchical'] ) {
                 $exclude_tree = array();
 
-                if ( $r['exclude_tree'] ) {
-                        $exclude_tree = array_merge( $exclude_tree, wp_parse_id_list( $r['exclude_tree'] ) );
-                }
-
-                if ( $r['exclude'] ) {
-                        $exclude_tree = array_merge( $exclude_tree, wp_parse_id_list( $r['exclude'] ) );
-                }
-
-                $r['exclude_tree'] = $exclude_tree;
-                $r['exclude']      = '';
-        }
-
-        if ( ! isset( $r['class'] ) ) {
-                $r['class'] = ( 'category' == $r['taxonomy'] ) ? 'categories' : $r['taxonomy'];
-        }
-
-        if ( ! taxonomy_exists( $r['taxonomy'] ) ) {
+                if ( $parsed_args['exclude_tree'] ) {
+                        $exclude_tree = array_merge( $exclude_tree, wp_parse_id_list( $parsed_args['exclude_tree'] ) );
+                }
+
+                if ( $parsed_args['exclude'] ) {
+                        $exclude_tree = array_merge( $exclude_tree, wp_parse_id_list( $parsed_args['exclude'] ) );
+                }
+
+                $parsed_args['exclude_tree'] = $exclude_tree;
+                $parsed_args['exclude']      = '';
+        }
+
+        if ( ! isset( $parsed_args['class'] ) ) {
+                $parsed_args['class'] = ( 'category' == $parsed_args['taxonomy'] ) ? 'categories' : $parsed_args['taxonomy'];
+        }
+
+        if ( ! taxonomy_exists( $parsed_args['taxonomy'] ) ) {
                 return false;
         }
 
-        $show_option_all  = $r['show_option_all'];
-        $show_option_none = $r['show_option_none'];
-
-        $categories = get_categories( $r );
+        $show_option_all  = $parsed_args['show_option_all'];
+        $show_option_none = $parsed_args['show_option_none'];
+
+        $categories = get_categories( $parsed_args );
 
         $output = '';
-        if ( $r['title_li'] && 'list' == $r['style'] && ( ! empty( $categories ) || ! $r['hide_title_if_empty'] ) ) {
-                $output = '<li class="' . esc_attr( $r['class'] ) . '">' . $r['title_li'] . '<ul>';
+        if ( $parsed_args['title_li'] && 'list' == $parsed_args['style'] && ( ! empty( $categories ) || ! $parsed_args['hide_title_if_empty'] ) ) {
+                $output = '<li class="' . esc_attr( $parsed_args['class'] ) . '">' . $parsed_args['title_li'] . '<ul>';
         }
         if ( empty( $categories ) ) {
                 if ( ! empty( $show_option_none ) ) {
-                        if ( 'list' == $r['style'] ) {
+                        if ( 'list' == $parsed_args['style'] ) {
                                 $output .= '<li class="cat-item-none">' . $show_option_none . '</li>';
                         } else {
@@ -591 +592 @@
 
                         // For taxonomies that belong only to custom post types, point to a valid archive.
-                        $taxonomy_object = get_taxonomy( $r['taxonomy'] );
+                        $taxonomy_object = get_taxonomy( $parsed_args['taxonomy'] );
                         if ( ! in_array( 'post', $taxonomy_object->object_type ) && ! in_array( 'page', $taxonomy_object->object_type ) ) {
                                 foreach ( $taxonomy_object->object_type as $object_type ) {
@@ -614 +615 @@
 
                         $posts_page = esc_url( $posts_page );
-                        if ( 'list' == $r['style'] ) {
+                        if ( 'list' == $parsed_args['style'] ) {
                                 $output .= "<li class='cat-item-all'><a href='$posts_page'>$show_option_all</a></li>";
                         } else {
@@ -621 +622 @@
                 }
 
-                if ( empty( $r['current_category'] ) && ( is_category() || is_tax() || is_tag() ) ) {
+                if ( empty( $parsed_args['current_category'] ) && ( is_category() || is_tax() || is_tag() ) ) {
                         $current_term_object = get_queried_object();
-                        if ( $current_term_object && $r['taxonomy'] === $current_term_object->taxonomy ) {
-                                $r['current_category'] = get_queried_object_id();
+                        if ( $current_term_object && $parsed_args['taxonomy'] === $current_term_object->taxonomy ) {
+                                $parsed_args['current_category'] = get_queried_object_id();
                         }
                 }
 
-                if ( $r['hierarchical'] ) {
-                        $depth = $r['depth'];
+                if ( $parsed_args['hierarchical'] ) {
+                        $depth = $parsed_args['depth'];
                 } else {
                         $depth = -1; // Flat.
                 }
-                $output .= walk_category_tree( $categories, $depth, $r );
-        }
-
-        if ( $r['title_li'] && 'list' == $r['style'] && ( ! empty( $categories ) || ! $r['hide_title_if_empty'] ) ) {
+                $output .= walk_category_tree( $categories, $depth, $parsed_args );
+        }
+
+        if ( $parsed_args['title_li'] && 'list' == $parsed_args['style'] && ( ! empty( $categories ) || ! $parsed_args['hide_title_if_empty'] ) ) {
                 $output .= '</ul></li>';
         }
@@ -650 +651 @@
         $html = apply_filters( 'wp_list_categories', $output, $args );
 
-        if ( $r['echo'] ) {
+        if ( $parsed_args['echo'] ) {
                 echo $html;
         } else {

trunk/src/wp-includes/class-http.php

@@ -221 +221 @@
                 }
 
-                $r = wp_parse_args( $args, $defaults );
+                $parsed_args = wp_parse_args( $args, $defaults );
                 /**
                  * Filters the arguments used in an HTTP request.
@@ -227 +227 @@
                  * @since 2.7.0
                  *
-                 * @param array  $r   An array of HTTP request arguments.
+                 * @param array  $parsed_args   An array of HTTP request arguments.
                  * @param string $url The request URL.
                  */
-                $r = apply_filters( 'http_request_args', $r, $url );
+                $parsed_args = apply_filters( 'http_request_args', $parsed_args, $url );
 
                 // The transports decrement this, store a copy of the original value for loop purposes.
-                if ( ! isset( $r['_redirection'] ) ) {
-                        $r['_redirection'] = $r['redirection'];
+                if ( ! isset( $parsed_args['_redirection'] ) ) {
+                        $parsed_args['_redirection'] = $parsed_args['redirection'];
                 }
 
@@ -252 +252 @@
                  *
                  * @param false|array|WP_Error $preempt Whether to preempt an HTTP request's return value. Default false.
-                 * @param array               $r        HTTP request arguments.
+                 * @param array               $parsed_args        HTTP request arguments.
                  * @param string              $url      The request URL.
                  */
-                $pre = apply_filters( 'pre_http_request', false, $r, $url );
+                $pre = apply_filters( 'pre_http_request', false, $parsed_args, $url );
 
                 if ( false !== $pre ) {
@@ -262 +262 @@
 
                 if ( function_exists( 'wp_kses_bad_protocol' ) ) {
-                        if ( $r['reject_unsafe_urls'] ) {
+                        if ( $parsed_args['reject_unsafe_urls'] ) {
                                 $url = wp_http_validate_url( $url );
                         }
@@ -275 +275 @@
                         $response = new WP_Error( 'http_request_failed', __( 'A valid URL was not provided.' ) );
                         /** This action is documented in wp-includes/class-http.php */
-                        do_action( 'http_api_debug', $response, 'response', 'Requests', $r, $url );
+                        do_action( 'http_api_debug', $response, 'response', 'Requests', $parsed_args, $url );
                         return $response;
                 }
@@ -282 +282 @@
                         $response = new WP_Error( 'http_request_not_executed', __( 'User has blocked requests through HTTP.' ) );
                         /** This action is documented in wp-includes/class-http.php */
-                        do_action( 'http_api_debug', $response, 'response', 'Requests', $r, $url );
+                        do_action( 'http_api_debug', $response, 'response', 'Requests', $parsed_args, $url );
                         return $response;
                 }
@@ -288 +288 @@
                 // If we are streaming to a file but no filename was given drop it in the WP temp dir
                 // and pick its name using the basename of the $url
-                if ( $r['stream'] ) {
-                        if ( empty( $r['filename'] ) ) {
-                                $r['filename'] = get_temp_dir() . basename( $url );
+                if ( $parsed_args['stream'] ) {
+                        if ( empty( $parsed_args['filename'] ) ) {
+                                $parsed_args['filename'] = get_temp_dir() . basename( $url );
                         }
 
                         // Force some settings if we are streaming to a file and check for existence and perms of destination directory
-                        $r['blocking'] = true;
-                        if ( ! wp_is_writable( dirname( $r['filename'] ) ) ) {
+                        $parsed_args['blocking'] = true;
+                        if ( ! wp_is_writable( dirname( $parsed_args['filename'] ) ) ) {
                                 $response = new WP_Error( 'http_request_failed', __( 'Destination directory for file streaming does not exist or is not writable.' ) );
                                 /** This action is documented in wp-includes/class-http.php */
-                                do_action( 'http_api_debug', $response, 'response', 'Requests', $r, $url );
+                                do_action( 'http_api_debug', $response, 'response', 'Requests', $parsed_args, $url );
                                 return $response;
                         }
                 }
 
-                if ( is_null( $r['headers'] ) ) {
-                        $r['headers'] = array();
+                if ( is_null( $parsed_args['headers'] ) ) {
+                        $parsed_args['headers'] = array();
                 }
 
                 // WP allows passing in headers as a string, weirdly.
-                if ( ! is_array( $r['headers'] ) ) {
-                        $processedHeaders = WP_Http::processHeaders( $r['headers'] );
-                        $r['headers']     = $processedHeaders['headers'];
+                if ( ! is_array( $parsed_args['headers'] ) ) {
+                        $processedHeaders       = WP_Http::processHeaders( $parsed_args['headers'] );
+                        $parsed_args['headers'] = $processedHeaders['headers'];
                 }
 
                 // Setup arguments
-                $headers = $r['headers'];
-                $data    = $r['body'];
-                $type    = $r['method'];
+                $headers = $parsed_args['headers'];
+                $data    = $parsed_args['body'];
+                $type    = $parsed_args['method'];
                 $options = array(
-                        'timeout'   => $r['timeout'],
-                        'useragent' => $r['user-agent'],
-                        'blocking'  => $r['blocking'],
-                        'hooks'     => new WP_HTTP_Requests_Hooks( $url, $r ),
+                        'timeout'   => $parsed_args['timeout'],
+                        'useragent' => $parsed_args['user-agent'],
+                        'blocking'  => $parsed_args['blocking'],
+                        'hooks'     => new WP_HTTP_Requests_Hooks( $url, $parsed_args ),
                 );
 
@@ -328 +328 @@
 
                 // Validate redirected URLs.
-                if ( function_exists( 'wp_kses_bad_protocol' ) && $r['reject_unsafe_urls'] ) {
+                if ( function_exists( 'wp_kses_bad_protocol' ) && $parsed_args['reject_unsafe_urls'] ) {
                         $options['hooks']->register( 'requests.before_redirect', array( get_class(), 'validate_redirects' ) );
                 }
 
-                if ( $r['stream'] ) {
-                        $options['filename'] = $r['filename'];
-                }
-                if ( empty( $r['redirection'] ) ) {
+                if ( $parsed_args['stream'] ) {
+                        $options['filename'] = $parsed_args['filename'];
+                }
+                if ( empty( $parsed_args['redirection'] ) ) {
                         $options['follow_redirects'] = false;
                 } else {
-                        $options['redirects'] = $r['redirection'];
+                        $options['redirects'] = $parsed_args['redirection'];
                 }
 
                 // Use byte limit, if we can
-                if ( isset( $r['limit_response_size'] ) ) {
-                        $options['max_bytes'] = $r['limit_response_size'];
+                if ( isset( $parsed_args['limit_response_size'] ) ) {
+                        $options['max_bytes'] = $parsed_args['limit_response_size'];
                 }
 
                 // If we've got cookies, use and convert them to Requests_Cookie.
-                if ( ! empty( $r['cookies'] ) ) {
-                        $options['cookies'] = WP_Http::normalize_cookies( $r['cookies'] );
+                if ( ! empty( $parsed_args['cookies'] ) ) {
+                        $options['cookies'] = WP_Http::normalize_cookies( $parsed_args['cookies'] );
                 }
 
                 // SSL certificate handling
-                if ( ! $r['sslverify'] ) {
+                if ( ! $parsed_args['sslverify'] ) {
                         $options['verify']     = false;
                         $options['verifyname'] = false;
                 } else {
-                        $options['verify'] = $r['sslcertificates'];
+                        $options['verify'] = $parsed_args['sslcertificates'];
                 }
 
@@ -394 +394 @@
 
                         // Convert the response into an array
-                        $http_response = new WP_HTTP_Requests_Response( $requests_response, $r['filename'] );
+                        $http_response = new WP_HTTP_Requests_Response( $requests_response, $parsed_args['filename'] );
                         $response      = $http_response->to_array();
 
@@ -413 +413 @@
                  * @param string         $context  Context under which the hook is fired.
                  * @param string         $class    HTTP transport used.
-                 * @param array          $r        HTTP request arguments.
+                 * @param array          $parsed_args        HTTP request arguments.
                  * @param string         $url      The request URL.
                  */
-                do_action( 'http_api_debug', $response, 'response', 'Requests', $r, $url );
+                do_action( 'http_api_debug', $response, 'response', 'Requests', $parsed_args, $url );
                 if ( is_wp_error( $response ) ) {
                         return $response;
                 }
 
-                if ( ! $r['blocking'] ) {
+                if ( ! $parsed_args['blocking'] ) {
                         return array(
                                 'headers'       => array(),
@@ -440 +440 @@
                  *
                  * @param array  $response HTTP response.
-                 * @param array  $r        HTTP request arguments.
+                 * @param array  $parsed_args        HTTP request arguments.
                  * @param string $url      The request URL.
                  */
-                return apply_filters( 'http_response', $response, $r, $url );
+                return apply_filters( 'http_response', $response, $parsed_args, $url );
         }
 
@@ -601 +601 @@
          */
         public function post( $url, $args = array() ) {
-                $defaults = array( 'method' => 'POST' );
-                $r        = wp_parse_args( $args, $defaults );
-                return $this->request( $url, $r );
+                $defaults    = array( 'method' => 'POST' );
+                $parsed_args = wp_parse_args( $args, $defaults );
+                return $this->request( $url, $parsed_args );
         }
 
@@ -618 +618 @@
          */
         public function get( $url, $args = array() ) {
-                $defaults = array( 'method' => 'GET' );
-                $r        = wp_parse_args( $args, $defaults );
-                return $this->request( $url, $r );
+                $defaults    = array( 'method' => 'GET' );
+                $parsed_args = wp_parse_args( $args, $defaults );
+                return $this->request( $url, $parsed_args );
         }
 
@@ -635 +635 @@
          */
         public function head( $url, $args = array() ) {
-                $defaults = array( 'method' => 'HEAD' );
-                $r        = wp_parse_args( $args, $defaults );
-                return $this->request( $url, $r );
+                $defaults    = array( 'method' => 'HEAD' );
+                $parsed_args = wp_parse_args( $args, $defaults );
+                return $this->request( $url, $parsed_args );
         }
 

trunk/src/wp-includes/class-wp-ajax-response.php

@@ -74 +74 @@
                 );
 
-                $r = wp_parse_args( $args, $defaults );
+                $parsed_args = wp_parse_args( $args, $defaults );
 
-                $position = preg_replace( '/[^a-z0-9:_-]/i', '', $r['position'] );
-                $id       = $r['id'];
-                $what     = $r['what'];
-                $action   = $r['action'];
-                $old_id   = $r['old_id'];
-                $data     = $r['data'];
+                $position = preg_replace( '/[^a-z0-9:_-]/i', '', $parsed_args['position'] );
+                $id       = $parsed_args['id'];
+                $what     = $parsed_args['what'];
+                $action   = $parsed_args['action'];
+                $old_id   = $parsed_args['old_id'];
+                $data     = $parsed_args['data'];
 
                 if ( is_wp_error( $id ) ) {
@@ -119 +119 @@
 
                 $s = '';
-                if ( is_array( $r['supplemental'] ) ) {
-                        foreach ( $r['supplemental'] as $k => $v ) {
+                if ( is_array( $parsed_args['supplemental'] ) ) {
+                        foreach ( $parsed_args['supplemental'] as $k => $v ) {
                                 $s .= "<$k><![CDATA[$v]]></$k>";
                         }

trunk/src/wp-includes/class-wp-http-curl.php

@@ -80 +80 @@
                 );
 
-                $r = wp_parse_args( $args, $defaults );
-
-                if ( isset( $r['headers']['User-Agent'] ) ) {
-                        $r['user-agent'] = $r['headers']['User-Agent'];
-                        unset( $r['headers']['User-Agent'] );
-                } elseif ( isset( $r['headers']['user-agent'] ) ) {
-                        $r['user-agent'] = $r['headers']['user-agent'];
-                        unset( $r['headers']['user-agent'] );
+                $parsed_args = wp_parse_args( $args, $defaults );
+
+                if ( isset( $parsed_args['headers']['User-Agent'] ) ) {
+                        $parsed_args['user-agent'] = $parsed_args['headers']['User-Agent'];
+                        unset( $parsed_args['headers']['User-Agent'] );
+                } elseif ( isset( $parsed_args['headers']['user-agent'] ) ) {
+                        $parsed_args['user-agent'] = $parsed_args['headers']['user-agent'];
+                        unset( $parsed_args['headers']['user-agent'] );
                 }
 
                 // Construct Cookie: header if any cookies are set.
-                WP_Http::buildCookieHeader( $r );
+                WP_Http::buildCookieHeader( $parsed_args );
 
                 $handle = curl_init();
@@ -110 +110 @@
                 }
 
-                $is_local   = isset( $r['local'] ) && $r['local'];
-                $ssl_verify = isset( $r['sslverify'] ) && $r['sslverify'];
+                $is_local   = isset( $parsed_args['local'] ) && $parsed_args['local'];
+                $ssl_verify = isset( $parsed_args['sslverify'] ) && $parsed_args['sslverify'];
                 if ( $is_local ) {
                         /** This filter is documented in wp-includes/class-wp-http-streams.php */
@@ -124 +124 @@
                  * a value of 0 will allow an unlimited timeout.
                  */
-                $timeout = (int) ceil( $r['timeout'] );
+                $timeout = (int) ceil( $parsed_args['timeout'] );
                 curl_setopt( $handle, CURLOPT_CONNECTTIMEOUT, $timeout );
                 curl_setopt( $handle, CURLOPT_TIMEOUT, $timeout );
@@ -134 +134 @@
 
                 if ( $ssl_verify ) {
-                        curl_setopt( $handle, CURLOPT_CAINFO, $r['sslcertificates'] );
-                }
-
-                curl_setopt( $handle, CURLOPT_USERAGENT, $r['user-agent'] );
+                        curl_setopt( $handle, CURLOPT_CAINFO, $parsed_args['sslcertificates'] );
+                }
+
+                curl_setopt( $handle, CURLOPT_USERAGENT, $parsed_args['user-agent'] );
 
                 /*
@@ -148 +148 @@
                 }
 
-                switch ( $r['method'] ) {
+                switch ( $parsed_args['method'] ) {
                         case 'HEAD':
                                 curl_setopt( $handle, CURLOPT_NOBODY, true );
@@ -154 +154 @@
                         case 'POST':
                                 curl_setopt( $handle, CURLOPT_POST, true );
-                                curl_setopt( $handle, CURLOPT_POSTFIELDS, $r['body'] );
+                                curl_setopt( $handle, CURLOPT_POSTFIELDS, $parsed_args['body'] );
                                 break;
                         case 'PUT':
                                 curl_setopt( $handle, CURLOPT_CUSTOMREQUEST, 'PUT' );
-                                curl_setopt( $handle, CURLOPT_POSTFIELDS, $r['body'] );
+                                curl_setopt( $handle, CURLOPT_POSTFIELDS, $parsed_args['body'] );
                                 break;
                         default:
-                                curl_setopt( $handle, CURLOPT_CUSTOMREQUEST, $r['method'] );
-                                if ( ! is_null( $r['body'] ) ) {
-                                        curl_setopt( $handle, CURLOPT_POSTFIELDS, $r['body'] );
+                                curl_setopt( $handle, CURLOPT_CUSTOMREQUEST, $parsed_args['method'] );
+                                if ( ! is_null( $parsed_args['body'] ) ) {
+                                        curl_setopt( $handle, CURLOPT_POSTFIELDS, $parsed_args['body'] );
                                 }
                                 break;
                 }
 
-                if ( true === $r['blocking'] ) {
+                if ( true === $parsed_args['blocking'] ) {
                         curl_setopt( $handle, CURLOPT_HEADERFUNCTION, array( $this, 'stream_headers' ) );
                         curl_setopt( $handle, CURLOPT_WRITEFUNCTION, array( $this, 'stream_body' ) );
@@ -175 +175 @@
                 curl_setopt( $handle, CURLOPT_HEADER, false );
 
-                if ( isset( $r['limit_response_size'] ) ) {
-                        $this->max_body_length = intval( $r['limit_response_size'] );
+                if ( isset( $parsed_args['limit_response_size'] ) ) {
+                        $this->max_body_length = intval( $parsed_args['limit_response_size'] );
                 } else {
                         $this->max_body_length = false;
@@ -182 +182 @@
 
                 // If streaming to a file open a file handle, and setup our curl streaming handler.
-                if ( $r['stream'] ) {
+                if ( $parsed_args['stream'] ) {
                         if ( ! WP_DEBUG ) {
-                                $this->stream_handle = @fopen( $r['filename'], 'w+' );
+                                $this->stream_handle = @fopen( $parsed_args['filename'], 'w+' );
                         } else {
-                                $this->stream_handle = fopen( $r['filename'], 'w+' );
+                                $this->stream_handle = fopen( $parsed_args['filename'], 'w+' );
                         }
                         if ( ! $this->stream_handle ) {
@@ -195 +195 @@
                                                 __( 'Could not open handle for %1$s to %2$s.' ),
                                                 'fopen()',
-                                                $r['filename']
+                                                $parsed_args['filename']
                                         )
                                 );
@@ -203 +203 @@
                 }
 
-                if ( ! empty( $r['headers'] ) ) {
+                if ( ! empty( $parsed_args['headers'] ) ) {
                         // cURL expects full header strings in each element.
                         $headers = array();
-                        foreach ( $r['headers'] as $name => $value ) {
+                        foreach ( $parsed_args['headers'] as $name => $value ) {
                                 $headers[] = "{$name}: $value";
                         }
@@ -212 +212 @@
                 }
 
-                if ( $r['httpversion'] == '1.0' ) {
+                if ( $parsed_args['httpversion'] == '1.0' ) {
                         curl_setopt( $handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0 );
                 } else {
@@ -227 +227 @@
                  *
                  * @param resource $handle  The cURL handle returned by curl_init() (passed by reference).
-                 * @param array    $r       The HTTP request arguments.
+                 * @param array    $parsed_args       The HTTP request arguments.
                  * @param string   $url     The request URL.
                  */
-                do_action_ref_array( 'http_api_curl', array( &$handle, $r, $url ) );
+                do_action_ref_array( 'http_api_curl', array( &$handle, $parsed_args, $url ) );
 
                 // We don't need to return the body, so don't. Just execute request and return.
-                if ( ! $r['blocking'] ) {
+                if ( ! $parsed_args['blocking'] ) {
                         curl_exec( $handle );
 
@@ -273 +273 @@
                         if ( CURLE_WRITE_ERROR /* 23 */ == $curl_error ) {
                                 if ( ! $this->max_body_length || $this->max_body_length != $bytes_written_total ) {
-                                        if ( $r['stream'] ) {
+                                        if ( $parsed_args['stream'] ) {
                                                 curl_close( $handle );
                                                 fclose( $this->stream_handle );
@@ -297 +297 @@
                 curl_close( $handle );
 
-                if ( $r['stream'] ) {
+                if ( $parsed_args['stream'] ) {
                         fclose( $this->stream_handle );
                 }
@@ -306 +306 @@
                         'response' => $theHeaders['response'],
                         'cookies'  => $theHeaders['cookies'],
-                        'filename' => $r['filename'],
+                        'filename' => $parsed_args['filename'],
                 );
 
                 // Handle redirects.
-                $redirect_response = WP_HTTP::handle_redirects( $url, $r, $response );
+                $redirect_response = WP_HTTP::handle_redirects( $url, $parsed_args, $response );
                 if ( false !== $redirect_response ) {
                         return $redirect_response;
                 }
 
-                if ( true === $r['decompress'] && true === WP_Http_Encoding::should_decode( $theHeaders['headers'] ) ) {
+                if ( true === $parsed_args['decompress'] && true === WP_Http_Encoding::should_decode( $theHeaders['headers'] ) ) {
                         $theBody = WP_Http_Encoding::decompress( $theBody );
                 }

trunk/src/wp-includes/class-wp-http-streams.php

@@ -39 +39 @@
                 );
 
-                $r = wp_parse_args( $args, $defaults );
-
-                if ( isset( $r['headers']['User-Agent'] ) ) {
-                        $r['user-agent'] = $r['headers']['User-Agent'];
-                        unset( $r['headers']['User-Agent'] );
-                } elseif ( isset( $r['headers']['user-agent'] ) ) {
-                        $r['user-agent'] = $r['headers']['user-agent'];
-                        unset( $r['headers']['user-agent'] );
+                $parsed_args = wp_parse_args( $args, $defaults );
+
+                if ( isset( $parsed_args['headers']['User-Agent'] ) ) {
+                        $parsed_args['user-agent'] = $parsed_args['headers']['User-Agent'];
+                        unset( $parsed_args['headers']['User-Agent'] );
+                } elseif ( isset( $parsed_args['headers']['user-agent'] ) ) {
+                        $parsed_args['user-agent'] = $parsed_args['headers']['user-agent'];
+                        unset( $parsed_args['headers']['user-agent'] );
                 }
 
                 // Construct Cookie: header if any cookies are set.
-                WP_Http::buildCookieHeader( $r );
+                WP_Http::buildCookieHeader( $parsed_args );
 
                 $arrURL = parse_url( $url );
@@ -71 +71 @@
                 }
 
-                if ( isset( $r['headers']['Host'] ) || isset( $r['headers']['host'] ) ) {
-                        if ( isset( $r['headers']['Host'] ) ) {
-                                $arrURL['host'] = $r['headers']['Host'];
+                if ( isset( $parsed_args['headers']['Host'] ) || isset( $parsed_args['headers']['host'] ) ) {
+                        if ( isset( $parsed_args['headers']['Host'] ) ) {
+                                $arrURL['host'] = $parsed_args['headers']['Host'];
                         } else {
-                                $arrURL['host'] = $r['headers']['host'];
-                        }
-                        unset( $r['headers']['Host'], $r['headers']['host'] );
+                                $arrURL['host'] = $parsed_args['headers']['host'];
+                        }
+                        unset( $parsed_args['headers']['Host'], $parsed_args['headers']['host'] );
                 }
 
@@ -91 +91 @@
                 $connect_host = $secure_transport ? 'ssl://' . $connect_host : 'tcp://' . $connect_host;
 
-                $is_local   = isset( $r['local'] ) && $r['local'];
-                $ssl_verify = isset( $r['sslverify'] ) && $r['sslverify'];
+                $is_local   = isset( $parsed_args['local'] ) && $parsed_args['local'];
+                $ssl_verify = isset( $parsed_args['sslverify'] ) && $parsed_args['sslverify'];
                 if ( $is_local ) {
                         /**
@@ -118 +118 @@
                                         'capture_peer_cert' => $ssl_verify,
                                         'SNI_enabled'       => true,
-                                        'cafile'            => $r['sslcertificates'],
+                                        'cafile'            => $parsed_args['sslcertificates'],
                                         'allow_self_signed' => ! $ssl_verify,
                                 ),
@@ -124 +124 @@
                 );
 
-                $timeout         = (int) floor( $r['timeout'] );
-                $utimeout        = $timeout == $r['timeout'] ? 0 : 1000000 * $r['timeout'] % 1000000;
+                $timeout         = (int) floor( $parsed_args['timeout'] );
+                $utimeout        = $timeout == $parsed_args['timeout'] ? 0 : 1000000 * $parsed_args['timeout'] % 1000000;
                 $connect_timeout = max( $timeout, 1 );
 
@@ -183 +183 @@
                 }
 
-                $strHeaders = strtoupper( $r['method'] ) . ' ' . $requestPath . ' HTTP/' . $r['httpversion'] . "\r\n";
+                $strHeaders = strtoupper( $parsed_args['method'] ) . ' ' . $requestPath . ' HTTP/' . $parsed_args['httpversion'] . "\r\n";
 
                 $include_port_in_host_header = (
@@ -197 +197 @@
                 }
 
-                if ( isset( $r['user-agent'] ) ) {
-                        $strHeaders .= 'User-agent: ' . $r['user-agent'] . "\r\n";
-                }
-
-                if ( is_array( $r['headers'] ) ) {
-                        foreach ( (array) $r['headers'] as $header => $headerValue ) {
+                if ( isset( $parsed_args['user-agent'] ) ) {
+                        $strHeaders .= 'User-agent: ' . $parsed_args['user-agent'] . "\r\n";
+                }
+
+                if ( is_array( $parsed_args['headers'] ) ) {
+                        foreach ( (array) $parsed_args['headers'] as $header => $headerValue ) {
                                 $strHeaders .= $header . ': ' . $headerValue . "\r\n";
                         }
                 } else {
-                        $strHeaders .= $r['headers'];
+                        $strHeaders .= $parsed_args['headers'];
                 }
 
@@ -215 +215 @@
                 $strHeaders .= "\r\n";
 
-                if ( ! is_null( $r['body'] ) ) {
-                        $strHeaders .= $r['body'];
+                if ( ! is_null( $parsed_args['body'] ) ) {
+                        $strHeaders .= $parsed_args['body'];
                 }
 
                 fwrite( $handle, $strHeaders );
 
-                if ( ! $r['blocking'] ) {
+                if ( ! $parsed_args['blocking'] ) {
                         stream_set_blocking( $handle, 0 );
                         fclose( $handle );
@@ -239 +239 @@
                 $keep_reading = true;
                 $block_size   = 4096;
-                if ( isset( $r['limit_response_size'] ) ) {
-                        $block_size = min( $block_size, $r['limit_response_size'] );
+                if ( isset( $parsed_args['limit_response_size'] ) ) {
+                        $block_size = min( $block_size, $parsed_args['limit_response_size'] );
                 }
 
                 // If streaming to a file setup the file handle.
-                if ( $r['stream'] ) {
+                if ( $parsed_args['stream'] ) {
                         if ( ! WP_DEBUG ) {
-                                $stream_handle = @fopen( $r['filename'], 'w+' );
+                                $stream_handle = @fopen( $parsed_args['filename'], 'w+' );
                         } else {
-                                $stream_handle = fopen( $r['filename'], 'w+' );
+                                $stream_handle = fopen( $parsed_args['filename'], 'w+' );
                         }
                         if ( ! $stream_handle ) {
@@ -257 +257 @@
                                                 __( 'Could not open handle for %1$s to %2$s.' ),
                                                 'fopen()',
-                                                $r['filename']
+                                                $parsed_args['filename']
                                         )
                                 );
@@ -278 +278 @@
                                 $this_block_size = strlen( $block );
 
-                                if ( isset( $r['limit_response_size'] ) && ( $bytes_written + $this_block_size ) > $r['limit_response_size'] ) {
-                                        $this_block_size = ( $r['limit_response_size'] - $bytes_written );
+                                if ( isset( $parsed_args['limit_response_size'] ) && ( $bytes_written + $this_block_size ) > $parsed_args['limit_response_size'] ) {
+                                        $this_block_size = ( $parsed_args['limit_response_size'] - $bytes_written );
                                         $block           = substr( $block, 0, $this_block_size );
                                 }
@@ -293 +293 @@
                                 $bytes_written += $bytes_written_to_file;
 
-                                $keep_reading = ! isset( $r['limit_response_size'] ) || $bytes_written < $r['limit_response_size'];
+                                $keep_reading = ! isset( $parsed_args['limit_response_size'] ) || $bytes_written < $parsed_args['limit_response_size'];
                         }
 
@@ -307 +307 @@
                                         $bodyStarted   = true;
                                 }
-                                $keep_reading = ( ! $bodyStarted || ! isset( $r['limit_response_size'] ) || strlen( $strResponse ) < ( $header_length + $r['limit_response_size'] ) );
+                                $keep_reading = ( ! $bodyStarted || ! isset( $parsed_args['limit_response_size'] ) || strlen( $strResponse ) < ( $header_length + $parsed_args['limit_response_size'] ) );
                         }
 
@@ -325 +325 @@
                         'response' => $arrHeaders['response'],
                         'cookies'  => $arrHeaders['cookies'],
-                        'filename' => $r['filename'],
+                        'filename' => $parsed_args['filename'],
                 );
 
                 // Handle redirects.
-                $redirect_response = WP_Http::handle_redirects( $url, $r, $response );
+                $redirect_response = WP_Http::handle_redirects( $url, $parsed_args, $response );
                 if ( false !== $redirect_response ) {
                         return $redirect_response;
@@ -339 +339 @@
                 }
 
-                if ( true === $r['decompress'] && true === WP_Http_Encoding::should_decode( $arrHeaders['headers'] ) ) {
+                if ( true === $parsed_args['decompress'] && true === WP_Http_Encoding::should_decode( $arrHeaders['headers'] ) ) {
                         $process['body'] = WP_Http_Encoding::decompress( $process['body'] );
                 }
 
-                if ( isset( $r['limit_response_size'] ) && strlen( $process['body'] ) > $r['limit_response_size'] ) {
-                        $process['body'] = substr( $process['body'], 0, $r['limit_response_size'] );
+                if ( isset( $parsed_args['limit_response_size'] ) && strlen( $process['body'] ) > $parsed_args['limit_response_size'] ) {
+                        $process['body'] = substr( $process['body'], 0, $parsed_args['limit_response_size'] );
                 }
 

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

@@ -2015 +2015 @@
         );
 
-        $r = wp_parse_args( $args, $defaults );
+        $parsed_args = wp_parse_args( $args, $defaults );
 
         /**
@@ -2024 +2024 @@
          * @see wp_list_comments()
          *
-         * @param array $r An array of arguments for displaying comments.
-         */
-        $r = apply_filters( 'wp_list_comments_args', $r );
+         * @param array $parsed_args An array of arguments for displaying comments.
+         */
+        $parsed_args = apply_filters( 'wp_list_comments_args', $parsed_args );
 
         // Figure out what comments we'll be looping through ($_comments)
@@ -2034 +2034 @@
                         return;
                 }
-                if ( 'all' != $r['type'] ) {
+                if ( 'all' != $parsed_args['type'] ) {
                         $comments_by_type = separate_comments( $comments );
-                        if ( empty( $comments_by_type[ $r['type'] ] ) ) {
+                        if ( empty( $comments_by_type[ $parsed_args['type'] ] ) ) {
                                 return;
                         }
-                        $_comments = $comments_by_type[ $r['type'] ];
+                        $_comments = $comments_by_type[ $parsed_args['type'] ];
                 } else {
                         $_comments = $comments;
@@ -2048 +2048 @@
                  * perform a separate comment query and allow Walker_Comment to paginate.
                  */
-                if ( $r['page'] || $r['per_page'] ) {
+                if ( $parsed_args['page'] || $parsed_args['per_page'] ) {
                         $current_cpage = get_query_var( 'cpage' );
                         if ( ! $current_cpage ) {
@@ -2055 +2055 @@
 
                         $current_per_page = get_query_var( 'comments_per_page' );
-                        if ( $r['page'] != $current_cpage || $r['per_page'] != $current_per_page ) {
+                        if ( $parsed_args['page'] != $current_cpage || $parsed_args['per_page'] != $current_per_page ) {
                                 $comment_args = array(
                                         'post_id' => get_the_ID(),
@@ -2075 +2075 @@
                                 $comments = get_comments( $comment_args );
 
-                                if ( 'all' != $r['type'] ) {
+                                if ( 'all' != $parsed_args['type'] ) {
                                         $comments_by_type = separate_comments( $comments );
-                                        if ( empty( $comments_by_type[ $r['type'] ] ) ) {
+                                        if ( empty( $comments_by_type[ $parsed_args['type'] ] ) ) {
                                                 return;
                                         }
 
-                                        $_comments = $comments_by_type[ $r['type'] ];
+                                        $_comments = $comments_by_type[ $parsed_args['type'] ];
                                 } else {
                                         $_comments = $comments;
@@ -2092 +2092 @@
                                 return;
                         }
-                        if ( 'all' != $r['type'] ) {
+                        if ( 'all' != $parsed_args['type'] ) {
                                 if ( empty( $wp_query->comments_by_type ) ) {
                                         $wp_query->comments_by_type = separate_comments( $wp_query->comments );
                                 }
-                                if ( empty( $wp_query->comments_by_type[ $r['type'] ] ) ) {
+                                if ( empty( $wp_query->comments_by_type[ $parsed_args['type'] ] ) ) {
                                         return;
                                 }
-                                $_comments = $wp_query->comments_by_type[ $r['type'] ];
+                                $_comments = $wp_query->comments_by_type[ $parsed_args['type'] ];
                         } else {
                                 $_comments = $wp_query->comments;
@@ -2108 +2108 @@
                                 $cpage                 = get_query_var( 'cpage' );
                                 if ( 'newest' === $default_comments_page ) {
-                                        $r['cpage'] = $cpage;
+                                        $parsed_args['cpage'] = $cpage;
 
                                         /*
@@ -2115 +2115 @@
                                         */
                                 } elseif ( $cpage == 1 ) {
-                                        $r['cpage'] = '';
+                                        $parsed_args['cpage'] = '';
                                 } else {
-                                        $r['cpage'] = $cpage;
+                                        $parsed_args['cpage'] = $cpage;
                                 }
 
-                                $r['page']     = 0;
-                                $r['per_page'] = 0;
+                                $parsed_args['page']     = 0;
+                                $parsed_args['per_page'] = 0;
                         }
                 }
         }
 
-        if ( '' === $r['per_page'] && get_option( 'page_comments' ) ) {
-                $r['per_page'] = get_query_var( 'comments_per_page' );
-        }
-
-        if ( empty( $r['per_page'] ) ) {
-                $r['per_page'] = 0;
-                $r['page']     = 0;
-        }
-
-        if ( '' === $r['max_depth'] ) {
+        if ( '' === $parsed_args['per_page'] && get_option( 'page_comments' ) ) {
+                $parsed_args['per_page'] = get_query_var( 'comments_per_page' );
+        }
+
+        if ( empty( $parsed_args['per_page'] ) ) {
+                $parsed_args['per_page'] = 0;
+                $parsed_args['page']     = 0;
+        }
+
+        if ( '' === $parsed_args['max_depth'] ) {
                 if ( get_option( 'thread_comments' ) ) {
-                        $r['max_depth'] = get_option( 'thread_comments_depth' );
+                        $parsed_args['max_depth'] = get_option( 'thread_comments_depth' );
                 } else {
-                        $r['max_depth'] = -1;
+                        $parsed_args['max_depth'] = -1;
                 }
         }
 
-        if ( '' === $r['page'] ) {
+        if ( '' === $parsed_args['page'] ) {
                 if ( empty( $overridden_cpage ) ) {
-                        $r['page'] = get_query_var( 'cpage' );
+                        $parsed_args['page'] = get_query_var( 'cpage' );
                 } else {
-                        $threaded  = ( -1 != $r['max_depth'] );
-                        $r['page'] = ( 'newest' == get_option( 'default_comments_page' ) ) ? get_comment_pages_count( $_comments, $r['per_page'], $threaded ) : 1;
-                        set_query_var( 'cpage', $r['page'] );
+                        $threaded            = ( -1 != $parsed_args['max_depth'] );
+                        $parsed_args['page'] = ( 'newest' == get_option( 'default_comments_page' ) ) ? get_comment_pages_count( $_comments, $parsed_args['per_page'], $threaded ) : 1;
+                        set_query_var( 'cpage', $parsed_args['page'] );
                 }
         }
         // Validation check
-        $r['page'] = intval( $r['page'] );
-        if ( 0 == $r['page'] && 0 != $r['per_page'] ) {
-                $r['page'] = 1;
-        }
-
-        if ( null === $r['reverse_top_level'] ) {
-                $r['reverse_top_level'] = ( 'desc' == get_option( 'comment_order' ) );
+        $parsed_args['page'] = intval( $parsed_args['page'] );
+        if ( 0 == $parsed_args['page'] && 0 != $parsed_args['per_page'] ) {
+                $parsed_args['page'] = 1;
+        }
+
+        if ( null === $parsed_args['reverse_top_level'] ) {
+                $parsed_args['reverse_top_level'] = ( 'desc' == get_option( 'comment_order' ) );
         }
 
         wp_queue_comments_for_comment_meta_lazyload( $_comments );
 
-        if ( empty( $r['walker'] ) ) {
+        if ( empty( $parsed_args['walker'] ) ) {
                 $walker = new Walker_Comment;
         } else {
-                $walker = $r['walker'];
-        }
-
-        $output = $walker->paged_walk( $_comments, $r['max_depth'], $r['page'], $r['per_page'], $r );
+                $walker = $parsed_args['walker'];
+        }
+
+        $output = $walker->paged_walk( $_comments, $parsed_args['max_depth'], $parsed_args['page'], $parsed_args['per_page'], $parsed_args );
 
         $in_comment_loop = false;
 
-        if ( $r['echo'] ) {
+        if ( $parsed_args['echo'] ) {
                 echo $output;
         } else {

trunk/src/wp-includes/comment.php

@@ -165 +165 @@
         }
 
-        $defaults = array(
+        $defaults    = array(
                 'status'  => 1,
                 'post_id' => $post_id,
                 'order'   => 'ASC',
         );
-        $r        = wp_parse_args( $args, $defaults );
+        $parsed_args = wp_parse_args( $args, $defaults );
 
         $query = new WP_Comment_Query;
-        return $query->query( $r );
+        return $query->query( $parsed_args );
 }
 

trunk/src/wp-includes/deprecated.php

@@ -431 +431 @@
         );
 
-        $r = wp_parse_args( $args, $defaults );
-
-        return wp_list_bookmarks($r);
+        $parsed_args = wp_parse_args( $args, $defaults );
+
+        return wp_list_bookmarks($parsed_args);
 }
 
@@ -636 +636 @@
         _deprecated_function( __FUNCTION__, '2.1.0', 'wp_list_categories()' );
 
-        $r = wp_parse_args( $args );
+        $parsed_args = wp_parse_args( $args );
 
         // Map to new names.
-        if ( isset($r['optionall']) && isset($r['all']))
-                $r['show_option_all'] = $r['all'];
-        if ( isset($r['sort_column']) )
-                $r['orderby'] = $r['sort_column'];
-        if ( isset($r['sort_order']) )
-                $r['order'] = $r['sort_order'];
-        if ( isset($r['optiondates']) )
-                $r['show_last_update'] = $r['optiondates'];
-        if ( isset($r['optioncount']) )
-                $r['show_count'] = $r['optioncount'];
-        if ( isset($r['list']) )
-                $r['style'] = $r['list'] ? 'list' : 'break';
-        $r['title_li'] = '';
-
-        return wp_list_categories($r);
+        if ( isset($parsed_args['optionall']) && isset($parsed_args['all']))
+                $parsed_args['show_option_all'] = $parsed_args['all'];
+        if ( isset($parsed_args['sort_column']) )
+                $parsed_args['orderby'] = $parsed_args['sort_column'];
+        if ( isset($parsed_args['sort_order']) )
+                $parsed_args['order'] = $parsed_args['sort_order'];
+        if ( isset($parsed_args['optiondates']) )
+                $parsed_args['show_last_update'] = $parsed_args['optiondates'];
+        if ( isset($parsed_args['optioncount']) )
+                $parsed_args['show_count'] = $parsed_args['optioncount'];
+        if ( isset($parsed_args['list']) )
+                $parsed_args['style'] = $parsed_args['list'] ? 'list' : 'break';
+        $parsed_args['title_li'] = '';
+
+        return wp_list_categories($parsed_args);
 }
 
@@ -893 +893 @@
         );
 
-        $r = wp_parse_args( $args, $defaults );
-
-        return wp_list_bookmarks($r);
+        $parsed_args = wp_parse_args( $args, $defaults );
+
+        return wp_list_bookmarks($parsed_args);
 }
 

trunk/src/wp-includes/functions.php

@@ -3081 +3081 @@
  */
 function _default_wp_die_handler( $message, $title = '', $args = array() ) {
-        list( $message, $title, $r ) = _wp_die_process_input( $message, $title, $args );
+        list( $message, $title, $parsed_args ) = _wp_die_process_input( $message, $title, $args );
 
         if ( is_string( $message ) ) {
-                if ( ! empty( $r['additional_errors'] ) ) {
+                if ( ! empty( $parsed_args['additional_errors'] ) ) {
                         $message = array_merge(
                                 array( $message ),
-                                wp_list_pluck( $r['additional_errors'], 'message' )
+                                wp_list_pluck( $parsed_args['additional_errors'], 'message' )
                         );
                         $message = "<ul>\n\t\t<li>" . join( "</li>\n\t\t<li>", $message ) . "</li>\n\t</ul>";
@@ -3097 +3097 @@
         $have_gettext = function_exists( '__' );
 
-        if ( ! empty( $r['link_url'] ) && ! empty( $r['link_text'] ) ) {
-                $link_url = $r['link_url'];
+        if ( ! empty( $parsed_args['link_url'] ) && ! empty( $parsed_args['link_text'] ) ) {
+                $link_url = $parsed_args['link_url'];
                 if ( function_exists( 'esc_url' ) ) {
                         $link_url = esc_url( $link_url );
                 }
-                $link_text = $r['link_text'];
+                $link_text = $parsed_args['link_text'];
                 $message  .= "\n<p><a href='{$link_url}'>{$link_text}</a></p>";
         }
 
-        if ( isset( $r['back_link'] ) && $r['back_link'] ) {
+        if ( isset( $parsed_args['back_link'] ) && $parsed_args['back_link'] ) {
                 $back_text = $have_gettext ? __( '&laquo; Back' ) : '&laquo; Back';
                 $message  .= "\n<p><a href='javascript:history.back()'>$back_text</a></p>";
@@ -3114 +3114 @@
                 if ( ! headers_sent() ) {
                         header( 'Content-Type: text/html; charset=utf-8' );
-                        status_header( $r['response'] );
+                        status_header( $parsed_args['response'] );
                         nocache_headers();
                 }
 
-                $text_direction = $r['text_direction'];
+                $text_direction = $parsed_args['text_direction'];
                 if ( function_exists( 'language_attributes' ) && function_exists( 'is_rtl' ) ) {
                         $dir_attr = get_language_attributes();
@@ -3259 +3259 @@
 </html>
         <?php
-        if ( $r['exit'] ) {
+        if ( $parsed_args['exit'] ) {
                 die();
         }
@@ -3283 +3283 @@
         );
 
-        list( $message, $title, $r ) = _wp_die_process_input( $message, $title, $args );
+        list( $message, $title, $parsed_args ) = _wp_die_process_input( $message, $title, $args );
 
         if ( ! headers_sent() ) {
                 // This is intentional. For backward-compatibility, support passing null here.
                 if ( null !== $args['response'] ) {
-                        status_header( $r['response'] );
+                        status_header( $parsed_args['response'] );
                 }
                 nocache_headers();
@@ -3299 +3299 @@
         }
 
-        if ( $r['exit'] ) {
+        if ( $parsed_args['exit'] ) {
                 die( $message );
         }
@@ -3319 +3319 @@
  */
 function _json_wp_die_handler( $message, $title = '', $args = array() ) {
-        list( $message, $title, $r ) = _wp_die_process_input( $message, $title, $args );
+        list( $message, $title, $parsed_args ) = _wp_die_process_input( $message, $title, $args );
 
         $data = array(
-                'code'              => $r['code'],
+                'code'              => $parsed_args['code'],
                 'message'           => $message,
                 'data'              => array(
-                        'status' => $r['response'],
+                        'status' => $parsed_args['response'],
                 ),
-                'additional_errors' => $r['additional_errors'],
+                'additional_errors' => $parsed_args['additional_errors'],
         );
 
         if ( ! headers_sent() ) {
                 header( 'Content-Type: application/json; charset=utf-8' );
-                if ( null !== $r['response'] ) {
-                        status_header( $r['response'] );
+                if ( null !== $parsed_args['response'] ) {
+                        status_header( $parsed_args['response'] );
                 }
                 nocache_headers();
@@ -3339 +3339 @@
 
         echo wp_json_encode( $data );
-        if ( $r['exit'] ) {
+        if ( $parsed_args['exit'] ) {
                 die();
         }
@@ -3357 +3357 @@
  */
 function _jsonp_wp_die_handler( $message, $title = '', $args = array() ) {
-        list( $message, $title, $r ) = _wp_die_process_input( $message, $title, $args );
+        list( $message, $title, $parsed_args ) = _wp_die_process_input( $message, $title, $args );
 
         $data = array(
-                'code'              => $r['code'],
+                'code'              => $parsed_args['code'],
                 'message'           => $message,
                 'data'              => array(
-                        'status' => $r['response'],
+                        'status' => $parsed_args['response'],
                 ),
-                'additional_errors' => $r['additional_errors'],
+                'additional_errors' => $parsed_args['additional_errors'],
         );
 
@@ -3372 +3372 @@
                 header( 'X-Content-Type-Options: nosniff' );
                 header( 'X-Robots-Tag: noindex' );
-                if ( null !== $r['response'] ) {
-                        status_header( $r['response'] );
+                if ( null !== $parsed_args['response'] ) {
+                        status_header( $parsed_args['response'] );
                 }
                 nocache_headers();
@@ -3381 +3381 @@
         $jsonp_callback = $_GET['_jsonp'];
         echo '/**/' . $jsonp_callback . '(' . $result . ')';
-        if ( $r['exit'] ) {
+        if ( $parsed_args['exit'] ) {
                 die();
         }
@@ -3403 +3403 @@
         global $wp_xmlrpc_server;
 
-        list( $message, $title, $r ) = _wp_die_process_input( $message, $title, $args );
+        list( $message, $title, $parsed_args ) = _wp_die_process_input( $message, $title, $args );
 
         if ( ! headers_sent() ) {
@@ -3410 +3410 @@
 
         if ( $wp_xmlrpc_server ) {
-                $error = new IXR_Error( $r['response'], $message );
+                $error = new IXR_Error( $parsed_args['response'], $message );
                 $wp_xmlrpc_server->output( $error->getXml() );
         }
-        if ( $r['exit'] ) {
+        if ( $parsed_args['exit'] ) {
                 die();
         }
@@ -3431 +3431 @@
  */
 function _xml_wp_die_handler( $message, $title = '', $args = array() ) {
-        list( $message, $title, $r ) = _wp_die_process_input( $message, $title, $args );
+        list( $message, $title, $parsed_args ) = _wp_die_process_input( $message, $title, $args );
 
         $message = htmlspecialchars( $message );
@@ -3438 +3438 @@
         $xml = <<<EOD
 <error>
-    <code>{$r['code']}</code>
+    <code>{$parsed_args['code']}</code>
     <title><![CDATA[{$title}]]></title>
     <message><![CDATA[{$message}]]></message>
     <data>
-        <status>{$r['response']}</status>
+        <status>{$parsed_args['response']}</status>
     </data>
 </error>
@@ -3450 +3450 @@
         if ( ! headers_sent() ) {
                 header( 'Content-Type: text/xml; charset=utf-8' );
-                if ( null !== $r['response'] ) {
-                        status_header( $r['response'] );
+                if ( null !== $parsed_args['response'] ) {
+                        status_header( $parsed_args['response'] );
                 }
                 nocache_headers();
@@ -3457 +3457 @@
 
         echo $xml;
-        if ( $r['exit'] ) {
+        if ( $parsed_args['exit'] ) {
                 die();
         }
@@ -3476 +3476 @@
  */
 function _scalar_wp_die_handler( $message = '', $title = '', $args = array() ) {
-        list( $message, $title, $r ) = _wp_die_process_input( $message, $title, $args );
-
-        if ( $r['exit'] ) {
+        list( $message, $title, $parsed_args ) = _wp_die_process_input( $message, $title, $args );
+
+        if ( $parsed_args['exit'] ) {
                 if ( is_scalar( $message ) ) {
                         die( (string) $message );
@@ -4108 +4108 @@
 function wp_parse_args( $args, $defaults = '' ) {
         if ( is_object( $args ) ) {
-                $r = get_object_vars( $args );
+                $parsed_args = get_object_vars( $args );
         } elseif ( is_array( $args ) ) {
-                $r =& $args;
+                $parsed_args =& $args;
         } else {
-                wp_parse_str( $args, $r );
+                wp_parse_str( $args, $parsed_args );
         }
 
         if ( is_array( $defaults ) ) {
-                return array_merge( $defaults, $r );
-        }
-        return $r;
+                return array_merge( $defaults, $parsed_args );
+        }
+        return $parsed_args;
 }
 

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

@@ -1822 +1822 @@
         );
 
-        $r = wp_parse_args( $args, $defaults );
-
-        $post_type_object = get_post_type_object( $r['post_type'] );
+        $parsed_args = wp_parse_args( $args, $defaults );
+
+        $post_type_object = get_post_type_object( $parsed_args['post_type'] );
         if ( ! is_post_type_viewable( $post_type_object ) ) {
                 return;
         }
-        $r['post_type'] = $post_type_object->name;
-
-        if ( '' == $r['type'] ) {
-                $r['type'] = 'monthly';
-        }
-
-        if ( ! empty( $r['limit'] ) ) {
-                $r['limit'] = absint( $r['limit'] );
-                $r['limit'] = ' LIMIT ' . $r['limit'];
-        }
-
-        $order = strtoupper( $r['order'] );
+        $parsed_args['post_type'] = $post_type_object->name;
+
+        if ( '' == $parsed_args['type'] ) {
+                $parsed_args['type'] = 'monthly';
+        }
+
+        if ( ! empty( $parsed_args['limit'] ) ) {
+                $parsed_args['limit'] = absint( $parsed_args['limit'] );
+                $parsed_args['limit'] = ' LIMIT ' . $parsed_args['limit'];
+        }
+
+        $order = strtoupper( $parsed_args['order'] );
         if ( $order !== 'ASC' ) {
                 $order = 'DESC';
@@ -1847 +1847 @@
         $archive_week_separator = '–';
 
-        $sql_where = $wpdb->prepare( "WHERE post_type = %s AND post_status = 'publish'", $r['post_type'] );
+        $sql_where = $wpdb->prepare( "WHERE post_type = %s AND post_status = 'publish'", $parsed_args['post_type'] );
 
         /**
@@ -1855 +1855 @@
          *
          * @param string $sql_where Portion of SQL query containing the WHERE clause.
-         * @param array  $r         An array of default arguments.
-         */
-        $where = apply_filters( 'getarchives_where', $sql_where, $r );
+         * @param array  $parsed_args         An array of default arguments.
+         */
+        $where = apply_filters( 'getarchives_where', $sql_where, $parsed_args );
 
         /**
@@ -1864 +1864 @@
          * @since 2.2.0
          *
-         * @param string $sql_join Portion of SQL query containing JOIN clause.
-         * @param array  $r        An array of default arguments.
-         */
-        $join = apply_filters( 'getarchives_join', '', $r );
+         * @param string $sql_join    Portion of SQL query containing JOIN clause.
+         * @param array  $parsed_args An array of default arguments.
+         */
+        $join = apply_filters( 'getarchives_join', '', $parsed_args );
 
         $output = '';
@@ -1873 +1873 @@
         $last_changed = wp_cache_get_last_changed( 'posts' );
 
-        $limit = $r['limit'];
-
-        if ( 'monthly' == $r['type'] ) {
+        $limit = $parsed_args['limit'];
+
+        if ( 'monthly' == $parsed_args['type'] ) {
                 $query   = "SELECT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date), MONTH(post_date) ORDER BY post_date $order $limit";
                 $key     = md5( $query );
@@ -1885 +1885 @@
                 }
                 if ( $results ) {
-                        $after = $r['after'];
+                        $after = $parsed_args['after'];
                         foreach ( (array) $results as $result ) {
                                 $url = get_month_link( $result->year, $result->month );
-                                if ( 'post' !== $r['post_type'] ) {
-                                        $url = add_query_arg( 'post_type', $r['post_type'], $url );
+                                if ( 'post' !== $parsed_args['post_type'] ) {
+                                        $url = add_query_arg( 'post_type', $parsed_args['post_type'], $url );
                                 }
                                 /* translators: 1: month name, 2: 4-digit year */
                                 $text = sprintf( __( '%1$s %2$d' ), $wp_locale->get_month( $result->month ), $result->year );
-                                if ( $r['show_post_count'] ) {
-                                        $r['after'] = ' (' . $result->posts . ')' . $after;
+                                if ( $parsed_args['show_post_count'] ) {
+                                        $parsed_args['after'] = ' (' . $result->posts . ')' . $after;
                                 }
-                                $selected = is_archive() && (string) $r['year'] === $result->year && (string) $r['monthnum'] === $result->month;
-                                $output  .= get_archives_link( $url, $text, $r['format'], $r['before'], $r['after'], $selected );
+                                $selected = is_archive() && (string) $parsed_args['year'] === $result->year && (string) $parsed_args['monthnum'] === $result->month;
+                                $output  .= get_archives_link( $url, $text, $parsed_args['format'], $parsed_args['before'], $parsed_args['after'], $selected );
                         }
                 }
-        } elseif ( 'yearly' == $r['type'] ) {
+        } elseif ( 'yearly' == $parsed_args['type'] ) {
                 $query   = "SELECT YEAR(post_date) AS `year`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date) ORDER BY post_date $order $limit";
                 $key     = md5( $query );
@@ -1910 +1910 @@
                 }
                 if ( $results ) {
-                        $after = $r['after'];
+                        $after = $parsed_args['after'];
                         foreach ( (array) $results as $result ) {
                                 $url = get_year_link( $result->year );
-                                if ( 'post' !== $r['post_type'] ) {
-                                        $url = add_query_arg( 'post_type', $r['post_type'], $url );
+                                if ( 'post' !== $parsed_args['post_type'] ) {
+                                        $url = add_query_arg( 'post_type', $parsed_args['post_type'], $url );
                                 }
                                 $text = sprintf( '%d', $result->year );
-                                if ( $r['show_post_count'] ) {
-                                        $r['after'] = ' (' . $result->posts . ')' . $after;
+                                if ( $parsed_args['show_post_count'] ) {
+                                        $parsed_args['after'] = ' (' . $result->posts . ')' . $after;
                                 }
-                                $selected = is_archive() && (string) $r['year'] === $result->year;
-                                $output  .= get_archives_link( $url, $text, $r['format'], $r['before'], $r['after'], $selected );
+                                $selected = is_archive() && (string) $parsed_args['year'] === $result->year;
+                                $output  .= get_archives_link( $url, $text, $parsed_args['format'], $parsed_args['before'], $parsed_args['after'], $selected );
                         }
                 }
-        } elseif ( 'daily' == $r['type'] ) {
+        } elseif ( 'daily' == $parsed_args['type'] ) {
                 $query   = "SELECT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, DAYOFMONTH(post_date) AS `dayofmonth`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date), MONTH(post_date), DAYOFMONTH(post_date) ORDER BY post_date $order $limit";
                 $key     = md5( $query );
@@ -1934 +1934 @@
                 }
                 if ( $results ) {
-                        $after = $r['after'];
+                        $after = $parsed_args['after'];
                         foreach ( (array) $results as $result ) {
                                 $url = get_day_link( $result->year, $result->month, $result->dayofmonth );
-                                if ( 'post' !== $r['post_type'] ) {
-                                        $url = add_query_arg( 'post_type', $r['post_type'], $url );
+                                if ( 'post' !== $parsed_args['post_type'] ) {
+                                        $url = add_query_arg( 'post_type', $parsed_args['post_type'], $url );
                                 }
                                 $date = sprintf( '%1$d-%2$02d-%3$02d 00:00:00', $result->year, $result->month, $result->dayofmonth );
                                 $text = mysql2date( get_option( 'date_format' ), $date );
-                                if ( $r['show_post_count'] ) {
-                                        $r['after'] = ' (' . $result->posts . ')' . $after;
+                                if ( $parsed_args['show_post_count'] ) {
+                                        $parsed_args['after'] = ' (' . $result->posts . ')' . $after;
                                 }
-                                $selected = is_archive() && (string) $r['year'] === $result->year && (string) $r['monthnum'] === $result->month && (string) $r['day'] === $result->dayofmonth;
-                                $output  .= get_archives_link( $url, $text, $r['format'], $r['before'], $r['after'], $selected );
+                                $selected = is_archive() && (string) $parsed_args['year'] === $result->year && (string) $parsed_args['monthnum'] === $result->month && (string) $parsed_args['day'] === $result->dayofmonth;
+                                $output  .= get_archives_link( $url, $text, $parsed_args['format'], $parsed_args['before'], $parsed_args['after'], $selected );
                         }
                 }
-        } elseif ( 'weekly' == $r['type'] ) {
+        } elseif ( 'weekly' == $parsed_args['type'] ) {
                 $week    = _wp_mysql_week( '`post_date`' );
                 $query   = "SELECT DISTINCT $week AS `week`, YEAR( `post_date` ) AS `yr`, DATE_FORMAT( `post_date`, '%Y-%m-%d' ) AS `yyyymmdd`, count( `ID` ) AS `posts` FROM `$wpdb->posts` $join $where GROUP BY $week, YEAR( `post_date` ) ORDER BY `post_date` $order $limit";
@@ -1961 +1961 @@
                 $arc_w_last = '';
                 if ( $results ) {
-                        $after = $r['after'];
+                        $after = $parsed_args['after'];
                         foreach ( (array) $results as $result ) {
                                 if ( $result->week != $arc_w_last ) {
@@ -1976 +1976 @@
                                                 home_url( '/' )
                                         );
-                                        if ( 'post' !== $r['post_type'] ) {
-                                                $url = add_query_arg( 'post_type', $r['post_type'], $url );
+                                        if ( 'post' !== $parsed_args['post_type'] ) {
+                                                $url = add_query_arg( 'post_type', $parsed_args['post_type'], $url );
                                         }
                                         $text = $arc_week_start . $archive_week_separator . $arc_week_end;
-                                        if ( $r['show_post_count'] ) {
-                                                $r['after'] = ' (' . $result->posts . ')' . $after;
+                                        if ( $parsed_args['show_post_count'] ) {
+                                                $parsed_args['after'] = ' (' . $result->posts . ')' . $after;
                                         }
-                                        $selected = is_archive() && (string) $r['year'] === $result->yr && (string) $r['w'] === $result->week;
-                                        $output  .= get_archives_link( $url, $text, $r['format'], $r['before'], $r['after'], $selected );
+                                        $selected = is_archive() && (string) $parsed_args['year'] === $result->yr && (string) $parsed_args['w'] === $result->week;
+                                        $output  .= get_archives_link( $url, $text, $parsed_args['format'], $parsed_args['before'], $parsed_args['after'], $selected );
                                 }
                         }
                 }
-        } elseif ( ( 'postbypost' == $r['type'] ) || ( 'alpha' == $r['type'] ) ) {
-                $orderby = ( 'alpha' == $r['type'] ) ? 'post_title ASC ' : 'post_date DESC, ID DESC ';
+        } elseif ( ( 'postbypost' == $parsed_args['type'] ) || ( 'alpha' == $parsed_args['type'] ) ) {
+                $orderby = ( 'alpha' == $parsed_args['type'] ) ? 'post_title ASC ' : 'post_date DESC, ID DESC ';
                 $query   = "SELECT * FROM $wpdb->posts $join $where ORDER BY $orderby $limit";
                 $key     = md5( $query );
@@ -2009 +2009 @@
                                         }
                                         $selected = $result->ID === get_the_ID();
-                                        $output  .= get_archives_link( $url, $text, $r['format'], $r['before'], $r['after'], $selected );
+                                        $output  .= get_archives_link( $url, $text, $parsed_args['format'], $parsed_args['before'], $parsed_args['after'], $selected );
                                 }
                         }
                 }
         }
-        if ( $r['echo'] ) {
+        if ( $parsed_args['echo'] ) {
                 echo $output;
         } else {

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

@@ -79 +79 @@
  */
 function the_title_attribute( $args = '' ) {
-        $defaults = array(
+        $defaults    = array(
                 'before' => '',
                 'after'  => '',
@@ -85 +85 @@
                 'post'   => get_post(),
         );
-        $r        = wp_parse_args( $args, $defaults );
-
-        $title = get_the_title( $r['post'] );
+        $parsed_args = wp_parse_args( $args, $defaults );
+
+        $title = get_the_title( $parsed_args['post'] );
 
         if ( strlen( $title ) == 0 ) {
@@ -93 +93 @@
         }
 
-        $title = $r['before'] . $title . $r['after'];
+        $title = $parsed_args['before'] . $title . $parsed_args['after'];
         $title = esc_attr( strip_tags( $title ) );
 
-        if ( $r['echo'] ) {
+        if ( $parsed_args['echo'] ) {
                 echo $title;
         } else {
@@ -947 +947 @@
         );
 
-        $params = wp_parse_args( $args, $defaults );
+        $parsed_args = wp_parse_args( $args, $defaults );
 
         /**
@@ -954 +954 @@
          * @since 3.0.0
          *
-         * @param array $params An array of arguments for page links for paginated posts.
+         * @param array $parsed_args An array of arguments for page links for paginated posts.
          */
-        $r = apply_filters( 'wp_link_pages_args', $params );
+        $parsed_args = apply_filters( 'wp_link_pages_args', $parsed_args );
 
         $output = '';
         if ( $multipage ) {
-                if ( 'number' == $r['next_or_number'] ) {
-                        $output .= $r['before'];
+                if ( 'number' == $parsed_args['next_or_number'] ) {
+                        $output .= $parsed_args['before'];
                         for ( $i = 1; $i <= $numpages; $i++ ) {
-                                $link = $r['link_before'] . str_replace( '%', $i, $r['pagelink'] ) . $r['link_after'];
+                                $link = $parsed_args['link_before'] . str_replace( '%', $i, $parsed_args['pagelink'] ) . $parsed_args['link_after'];
                                 if ( $i != $page || ! $more && 1 == $page ) {
                                         $link = _wp_link_page( $i ) . $link . '</a>';
                                 } elseif ( $i === $page ) {
-                                        $link = '<span class="post-page-numbers current" aria-current="' . esc_attr( $r['aria_current'] ) . '">' . $link . '</span>';
+                                        $link = '<span class="post-page-numbers current" aria-current="' . esc_attr( $parsed_args['aria_current'] ) . '">' . $link . '</span>';
                                 }
                                 /**
@@ -980 +980 @@
 
                                 // Use the custom links separator beginning with the second link.
-                                $output .= ( 1 === $i ) ? ' ' : $r['separator'];
+                                $output .= ( 1 === $i ) ? ' ' : $parsed_args['separator'];
                                 $output .= $link;
                         }
-                        $output .= $r['after'];
+                        $output .= $parsed_args['after'];
                 } elseif ( $more ) {
-                        $output .= $r['before'];
+                        $output .= $parsed_args['before'];
                         $prev    = $page - 1;
                         if ( $prev > 0 ) {
-                                $link = _wp_link_page( $prev ) . $r['link_before'] . $r['previouspagelink'] . $r['link_after'] . '</a>';
+                                $link = _wp_link_page( $prev ) . $parsed_args['link_before'] . $parsed_args['previouspagelink'] . $parsed_args['link_after'] . '</a>';
 
                                 /** This filter is documented in wp-includes/post-template.php */
@@ -996 +996 @@
                         if ( $next <= $numpages ) {
                                 if ( $prev ) {
-                                        $output .= $r['separator'];
+                                        $output .= $parsed_args['separator'];
                                 }
-                                $link = _wp_link_page( $next ) . $r['link_before'] . $r['nextpagelink'] . $r['link_after'] . '</a>';
+                                $link = _wp_link_page( $next ) . $parsed_args['link_before'] . $parsed_args['nextpagelink'] . $parsed_args['link_after'] . '</a>';
 
                                 /** This filter is documented in wp-includes/post-template.php */
                                 $output .= apply_filters( 'wp_link_pages_link', $link, $next );
                         }
-                        $output .= $r['after'];
+                        $output .= $parsed_args['after'];
                 }
         }
@@ -1017 +1017 @@
         $html = apply_filters( 'wp_link_pages', $output, $args );
 
-        if ( $r['echo'] ) {
+        if ( $parsed_args['echo'] ) {
                 echo $html;
         }
@@ -1182 +1182 @@
         );
 
-        $r = wp_parse_args( $args, $defaults );
-
-        $pages  = get_pages( $r );
+        $parsed_args = wp_parse_args( $args, $defaults );
+
+        $pages  = get_pages( $parsed_args );
         $output = '';
         // Back-compat with old system where both id and name were based on $name argument
-        if ( empty( $r['id'] ) ) {
-                $r['id'] = $r['name'];
+        if ( empty( $parsed_args['id'] ) ) {
+                $parsed_args['id'] = $parsed_args['name'];
         }
 
         if ( ! empty( $pages ) ) {
                 $class = '';
-                if ( ! empty( $r['class'] ) ) {
-                        $class = " class='" . esc_attr( $r['class'] ) . "'";
-                }
-
-                $output = "<select name='" . esc_attr( $r['name'] ) . "'" . $class . " id='" . esc_attr( $r['id'] ) . "'>\n";
-                if ( $r['show_option_no_change'] ) {
-                        $output .= "\t<option value=\"-1\">" . $r['show_option_no_change'] . "</option>\n";
-                }
-                if ( $r['show_option_none'] ) {
-                        $output .= "\t<option value=\"" . esc_attr( $r['option_none_value'] ) . '">' . $r['show_option_none'] . "</option>\n";
-                }
-                $output .= walk_page_dropdown_tree( $pages, $r['depth'], $r );
+                if ( ! empty( $parsed_args['class'] ) ) {
+                        $class = " class='" . esc_attr( $parsed_args['class'] ) . "'";
+                }
+
+                $output = "<select name='" . esc_attr( $parsed_args['name'] ) . "'" . $class . " id='" . esc_attr( $parsed_args['id'] ) . "'>\n";
+                if ( $parsed_args['show_option_no_change'] ) {
+                        $output .= "\t<option value=\"-1\">" . $parsed_args['show_option_no_change'] . "</option>\n";
+                }
+                if ( $parsed_args['show_option_none'] ) {
+                        $output .= "\t<option value=\"" . esc_attr( $parsed_args['option_none_value'] ) . '">' . $parsed_args['show_option_none'] . "</option>\n";
+                }
+                $output .= walk_page_dropdown_tree( $pages, $parsed_args['depth'], $parsed_args );
                 $output .= "</select>\n";
         }
@@ -1212 +1212 @@
          *
          * @since 2.1.0
-         * @since 4.4.0 `$r` and `$pages` added as arguments.
-         *
-         * @param string $output HTML output for drop down list of pages.
-         * @param array  $r      The parsed arguments array.
-         * @param array  $pages  List of WP_Post objects returned by `get_pages()`
+         * @since 4.4.0 `$parsed_args` and `$pages` added as arguments.
+         *
+         * @param string $output      HTML output for drop down list of pages.
+         * @param array  $parsed_args The parsed arguments array.
+         * @param array  $pages       List of WP_Post objects returned by `get_pages()`
          */
-        $html = apply_filters( 'wp_dropdown_pages', $output, $r, $pages );
-
-        if ( $r['echo'] ) {
+        $html = apply_filters( 'wp_dropdown_pages', $output, $parsed_args, $pages );
+
+        if ( $parsed_args['echo'] ) {
                 echo $html;
         }
@@ -1283 +1283 @@
         );
 
-        $r = wp_parse_args( $args, $defaults );
-
-        if ( ! in_array( $r['item_spacing'], array( 'preserve', 'discard' ), true ) ) {
+        $parsed_args = wp_parse_args( $args, $defaults );
+
+        if ( ! in_array( $parsed_args['item_spacing'], array( 'preserve', 'discard' ), true ) ) {
                 // invalid value, fall back to default.
-                $r['item_spacing'] = $defaults['item_spacing'];
+                $parsed_args['item_spacing'] = $defaults['item_spacing'];
         }
 
@@ -1294 +1294 @@
 
         // sanitize, mostly to keep spaces out
-        $r['exclude'] = preg_replace( '/[^0-9,]/', '', $r['exclude'] );
+        $parsed_args['exclude'] = preg_replace( '/[^0-9,]/', '', $parsed_args['exclude'] );
 
         // Allow plugins to filter an array of excluded pages (but don't put a nullstring into the array)
-        $exclude_array = ( $r['exclude'] ) ? explode( ',', $r['exclude'] ) : array();
+        $exclude_array = ( $parsed_args['exclude'] ) ? explode( ',', $parsed_args['exclude'] ) : array();
 
         /**
@@ -1306 +1306 @@
          * @param array $exclude_array An array of page IDs to exclude.
          */
-        $r['exclude'] = implode( ',', apply_filters( 'wp_list_pages_excludes', $exclude_array ) );
+        $parsed_args['exclude'] = implode( ',', apply_filters( 'wp_list_pages_excludes', $exclude_array ) );
+
+        $parsed_args['hierarchical'] = 0;
 
         // Query pages.
-        $r['hierarchical'] = 0;
-        $pages             = get_pages( $r );
+        $pages = get_pages( $parsed_args );
 
         if ( ! empty( $pages ) ) {
-                if ( $r['title_li'] ) {
-                        $output .= '<li class="pagenav">' . $r['title_li'] . '<ul>';
+                if ( $parsed_args['title_li'] ) {
+                        $output .= '<li class="pagenav">' . $parsed_args['title_li'] . '<ul>';
                 }
                 global $wp_query;
@@ -1326 +1327 @@
                 }
 
-                $output .= walk_page_tree( $pages, $r['depth'], $current_page, $r );
-
-                if ( $r['title_li'] ) {
+                $output .= walk_page_tree( $pages, $parsed_args['depth'], $current_page, $parsed_args );
+
+                if ( $parsed_args['title_li'] ) {
                         $output .= '</ul></li>';
                 }
@@ -1341 +1342 @@
          * @see wp_list_pages()
          *
-         * @param string $output HTML output of the pages list.
-         * @param array  $r      An array of page-listing arguments.
-         * @param array  $pages  List of WP_Post objects returned by `get_pages()`
+         * @param string $output      HTML output of the pages list.
+         * @param array  $parsed_args An array of page-listing arguments.
+         * @param array  $pages       List of WP_Post objects returned by `get_pages()`
          */
-        $html = apply_filters( 'wp_list_pages', $output, $r, $pages );
-
-        if ( $r['echo'] ) {
+        $html = apply_filters( 'wp_list_pages', $output, $parsed_args, $pages );
+
+        if ( $parsed_args['echo'] ) {
                 echo $html;
         } else {

trunk/src/wp-includes/post.php

@@ -614 +614 @@
         );
 
-        $r = wp_parse_args( $args, $defaults );
-
-        $children = get_posts( $r );
+        $parsed_args = wp_parse_args( $args, $defaults );
+
+        $children = get_posts( $parsed_args );
 
         if ( ! $children ) {
@@ -622 +622 @@
         }
 
-        if ( ! empty( $r['fields'] ) ) {
+        if ( ! empty( $parsed_args['fields'] ) ) {
                 return $children;
         }
@@ -1955 +1955 @@
         );
 
-        $r = wp_parse_args( $args, $defaults );
-        if ( empty( $r['post_status'] ) ) {
-                $r['post_status'] = ( 'attachment' == $r['post_type'] ) ? 'inherit' : 'publish';
-        }
-        if ( ! empty( $r['numberposts'] ) && empty( $r['posts_per_page'] ) ) {
-                $r['posts_per_page'] = $r['numberposts'];
-        }
-        if ( ! empty( $r['category'] ) ) {
-                $r['cat'] = $r['category'];
-        }
-        if ( ! empty( $r['include'] ) ) {
-                $incposts            = wp_parse_id_list( $r['include'] );
-                $r['posts_per_page'] = count( $incposts );  // only the number of posts included
-                $r['post__in']       = $incposts;
-        } elseif ( ! empty( $r['exclude'] ) ) {
-                $r['post__not_in'] = wp_parse_id_list( $r['exclude'] );
-        }
-
-        $r['ignore_sticky_posts'] = true;
-        $r['no_found_rows']       = true;
+        $parsed_args = wp_parse_args( $args, $defaults );
+        if ( empty( $parsed_args['post_status'] ) ) {
+                $parsed_args['post_status'] = ( 'attachment' == $parsed_args['post_type'] ) ? 'inherit' : 'publish';
+        }
+        if ( ! empty( $parsed_args['numberposts'] ) && empty( $parsed_args['posts_per_page'] ) ) {
+                $parsed_args['posts_per_page'] = $parsed_args['numberposts'];
+        }
+        if ( ! empty( $parsed_args['category'] ) ) {
+                $parsed_args['cat'] = $parsed_args['category'];
+        }
+        if ( ! empty( $parsed_args['include'] ) ) {
+                $incposts                      = wp_parse_id_list( $parsed_args['include'] );
+                $parsed_args['posts_per_page'] = count( $incposts );  // only the number of posts included
+                $parsed_args['post__in']       = $incposts;
+        } elseif ( ! empty( $parsed_args['exclude'] ) ) {
+                $parsed_args['post__not_in'] = wp_parse_id_list( $parsed_args['exclude'] );
+        }
+
+        $parsed_args['ignore_sticky_posts'] = true;
+        $parsed_args['no_found_rows']       = true;
 
         $get_posts = new WP_Query;
-        return $get_posts->query( $r );
+        return $get_posts->query( $parsed_args );
 
 }
@@ -3382 +3382 @@
         );
 
-        $r = wp_parse_args( $args, $defaults );
-
-        $results = get_posts( $r );
+        $parsed_args = wp_parse_args( $args, $defaults );
+
+        $results = get_posts( $parsed_args );
 
         // Backward compatibility. Prior to 3.1 expected posts to be returned in array.
@@ -5112 +5112 @@
         );
 
-        $r = wp_parse_args( $args, $defaults );
-
-        $number       = (int) $r['number'];
-        $offset       = (int) $r['offset'];
-        $child_of     = (int) $r['child_of'];
-        $hierarchical = $r['hierarchical'];
-        $exclude      = $r['exclude'];
-        $meta_key     = $r['meta_key'];
-        $meta_value   = $r['meta_value'];
-        $parent       = $r['parent'];
-        $post_status  = $r['post_status'];
+        $parsed_args = wp_parse_args( $args, $defaults );
+
+        $number       = (int) $parsed_args['number'];
+        $offset       = (int) $parsed_args['offset'];
+        $child_of     = (int) $parsed_args['child_of'];
+        $hierarchical = $parsed_args['hierarchical'];
+        $exclude      = $parsed_args['exclude'];
+        $meta_key     = $parsed_args['meta_key'];
+        $meta_value   = $parsed_args['meta_value'];
+        $parent       = $parsed_args['parent'];
+        $post_status  = $parsed_args['post_status'];
 
         // Make sure the post type is hierarchical.
         $hierarchical_post_types = get_post_types( array( 'hierarchical' => true ) );
-        if ( ! in_array( $r['post_type'], $hierarchical_post_types ) ) {
+        if ( ! in_array( $parsed_args['post_type'], $hierarchical_post_types ) ) {
                 return false;
         }
@@ -5143 +5143 @@
 
         // $args can be whatever, only use the args defined in defaults to compute the key.
-        $key          = md5( serialize( wp_array_slice_assoc( $r, array_keys( $defaults ) ) ) );
+        $key          = md5( serialize( wp_array_slice_assoc( $parsed_args, array_keys( $defaults ) ) ) );
         $last_changed = wp_cache_get_last_changed( 'posts' );
 
@@ -5152 +5152 @@
                 $pages = array_map( 'get_post', $cache );
                 /** This filter is documented in wp-includes/post.php */
-                $pages = apply_filters( 'get_pages', $pages, $r );
+                $pages = apply_filters( 'get_pages', $pages, $parsed_args );
                 return $pages;
         }
 
         $inclusions = '';
-        if ( ! empty( $r['include'] ) ) {
+        if ( ! empty( $parsed_args['include'] ) ) {
                 $child_of     = 0; //ignore child_of, parent, exclude, meta_key, and meta_value params if using include
                 $parent       = -1;
@@ -5164 +5164 @@
                 $meta_value   = '';
                 $hierarchical = false;
-                $incpages     = wp_parse_id_list( $r['include'] );
+                $incpages     = wp_parse_id_list( $parsed_args['include'] );
                 if ( ! empty( $incpages ) ) {
                         $inclusions = ' AND ID IN (' . implode( ',', $incpages ) . ')';
@@ -5179 +5179 @@
 
         $author_query = '';
-        if ( ! empty( $r['authors'] ) ) {
-                $post_authors = wp_parse_list( $r['authors'] );
+        if ( ! empty( $parsed_args['authors'] ) ) {
+                $post_authors = wp_parse_list( $parsed_args['authors'] );
 
                 if ( ! empty( $post_authors ) ) {
@@ -5234 +5234 @@
 
         if ( 1 == count( $post_status ) ) {
-                $where_post_type = $wpdb->prepare( 'post_type = %s AND post_status = %s', $r['post_type'], reset( $post_status ) );
+                $where_post_type = $wpdb->prepare( 'post_type = %s AND post_status = %s', $parsed_args['post_type'], reset( $post_status ) );
         } else {
                 $post_status     = implode( "', '", $post_status );
-                $where_post_type = $wpdb->prepare( "post_type = %s AND post_status IN ('$post_status')", $r['post_type'] );
+                $where_post_type = $wpdb->prepare( "post_type = %s AND post_status IN ('$post_status')", $parsed_args['post_type'] );
         }
 
@@ -5262 +5262 @@
         );
 
-        foreach ( explode( ',', $r['sort_column'] ) as $orderby ) {
+        foreach ( explode( ',', $parsed_args['sort_column'] ) as $orderby ) {
                 $orderby = trim( $orderby );
                 if ( ! in_array( $orderby, $allowed_keys ) ) {
@@ -5293 +5293 @@
         $sort_column = ! empty( $orderby_array ) ? implode( ',', $orderby_array ) : "$wpdb->posts.post_title";
 
-        $sort_order = strtoupper( $r['sort_order'] );
+        $sort_order = strtoupper( $parsed_args['sort_order'] );
         if ( '' !== $sort_order && ! in_array( $sort_order, array( 'ASC', 'DESC' ) ) ) {
                 $sort_order = 'ASC';
@@ -5312 +5312 @@
 
                 /** This filter is documented in wp-includes/post.php */
-                $pages = apply_filters( 'get_pages', array(), $r );
+                $pages = apply_filters( 'get_pages', array(), $parsed_args );
                 return $pages;
         }
@@ -5329 +5329 @@
         }
 
-        if ( ! empty( $r['exclude_tree'] ) ) {
-                $exclude = wp_parse_id_list( $r['exclude_tree'] );
+        if ( ! empty( $parsed_args['exclude_tree'] ) ) {
+                $exclude = wp_parse_id_list( $parsed_args['exclude_tree'] );
                 foreach ( $exclude as $id ) {
                         $children = get_page_children( $id, $pages );
@@ -5362 +5362 @@
          *
          * @param array $pages List of pages to retrieve.
-         * @param array $r     Array of get_pages() arguments.
+         * @param array $parsed_args     Array of get_pages() arguments.
          */
-        return apply_filters( 'get_pages', $pages, $r );
+        return apply_filters( 'get_pages', $pages, $parsed_args );
 }
 

trunk/src/wp-includes/taxonomy.php

@@ -4296 +4296 @@
         );
 
-        $r = wp_parse_args( $args, $defaults );
-
-        echo $r['before'] . join( $r['sep'], get_the_taxonomies( $r['post'], $r ) ) . $r['after'];
+        $parsed_args = wp_parse_args( $args, $defaults );
+
+        echo $parsed_args['before'] . join( $parsed_args['sep'], get_the_taxonomies( $parsed_args['post'], $parsed_args ) ) . $parsed_args['after'];
 }
 

trunk/src/wp-includes/user.php

@@ -1124 +1124 @@
         $defaults['selected'] = is_author() ? get_query_var( 'author' ) : 0;
 
-        $r = wp_parse_args( $args, $defaults );
-
-        $query_args = wp_array_slice_assoc( $r, array( 'blog_id', 'include', 'exclude', 'orderby', 'order', 'who', 'role', 'role__in', 'role__not_in' ) );
+        $parsed_args = wp_parse_args( $args, $defaults );
+
+        $query_args = wp_array_slice_assoc( $parsed_args, array( 'blog_id', 'include', 'exclude', 'orderby', 'order', 'who', 'role', 'role__in', 'role__not_in' ) );
 
         $fields = array( 'ID', 'user_login' );
 
-        $show = ! empty( $r['show'] ) ? $r['show'] : 'display_name';
+        $show = ! empty( $parsed_args['show'] ) ? $parsed_args['show'] : 'display_name';
         if ( 'display_name_with_login' === $show ) {
                 $fields[] = 'display_name';
@@ -1139 +1139 @@
         $query_args['fields'] = $fields;
 
-        $show_option_all   = $r['show_option_all'];
-        $show_option_none  = $r['show_option_none'];
-        $option_none_value = $r['option_none_value'];
+        $show_option_all   = $parsed_args['show_option_all'];
+        $show_option_none  = $parsed_args['show_option_none'];
+        $option_none_value = $parsed_args['option_none_value'];
 
         /**
@@ -1149 +1149 @@
          *
          * @param array $query_args The query arguments for get_users().
-         * @param array $r          The arguments passed to wp_dropdown_users() combined with the defaults.
-         */
-        $query_args = apply_filters( 'wp_dropdown_users_args', $query_args, $r );
+         * @param array $parsed_args          The arguments passed to wp_dropdown_users() combined with the defaults.
+         */
+        $query_args = apply_filters( 'wp_dropdown_users_args', $query_args, $parsed_args );
 
         $users = get_users( $query_args );
 
         $output = '';
-        if ( ! empty( $users ) && ( empty( $r['hide_if_only_one_author'] ) || count( $users ) > 1 ) ) {
-                $name = esc_attr( $r['name'] );
-                if ( $r['multi'] && ! $r['id'] ) {
+        if ( ! empty( $users ) && ( empty( $parsed_args['hide_if_only_one_author'] ) || count( $users ) > 1 ) ) {
+                $name = esc_attr( $parsed_args['name'] );
+                if ( $parsed_args['multi'] && ! $parsed_args['id'] ) {
                         $id = '';
                 } else {
-                        $id = $r['id'] ? " id='" . esc_attr( $r['id'] ) . "'" : " id='$name'";
-                }
-                $output = "<select name='{$name}'{$id} class='" . $r['class'] . "'>\n";
+                        $id = $parsed_args['id'] ? " id='" . esc_attr( $parsed_args['id'] ) . "'" : " id='$name'";
+                }
+                $output = "<select name='{$name}'{$id} class='" . $parsed_args['class'] . "'>\n";
 
                 if ( $show_option_all ) {
@@ -1170 +1170 @@
 
                 if ( $show_option_none ) {
-                        $_selected = selected( $option_none_value, $r['selected'], false );
+                        $_selected = selected( $option_none_value, $parsed_args['selected'], false );
                         $output   .= "\t<option value='" . esc_attr( $option_none_value ) . "'$_selected>$show_option_none</option>\n";
                 }
 
-                if ( $r['include_selected'] && ( $r['selected'] > 0 ) ) {
-                        $found_selected = false;
-                        $r['selected']  = (int) $r['selected'];
+                if ( $parsed_args['include_selected'] && ( $parsed_args['selected'] > 0 ) ) {
+                        $found_selected          = false;
+                        $parsed_args['selected'] = (int) $parsed_args['selected'];
                         foreach ( (array) $users as $user ) {
                                 $user->ID = (int) $user->ID;
-                                if ( $user->ID === $r['selected'] ) {
+                                if ( $user->ID === $parsed_args['selected'] ) {
                                         $found_selected = true;
                                 }
@@ -1185 +1185 @@
 
                         if ( ! $found_selected ) {
-                                $users[] = get_userdata( $r['selected'] );
+                                $users[] = get_userdata( $parsed_args['selected'] );
                         }
                 }
@@ -1199 +1199 @@
                         }
 
-                        $_selected = selected( $user->ID, $r['selected'], false );
+                        $_selected = selected( $user->ID, $parsed_args['selected'], false );
                         $output   .= "\t<option value='$user->ID'$_selected>" . esc_html( $display ) . "</option>\n";
                 }
@@ -1215 +1215 @@
         $html = apply_filters( 'wp_dropdown_users', $output );
 
-        if ( $r['echo'] ) {
+        if ( $parsed_args['echo'] ) {
                 echo $html;
         }