Ticket #8564: 8564-1.diff

src/bp-activity/bp-activity-blocks.php

@@ -21 +21 @@
  * @return string           HTML output.
  */
 function bp_activity_render_latest_activities_block( $attributes = array() ) {
-        $block_args = wp_parse_args(
+        $block_args = bp_parse_args(
                 $attributes,
                 array(
                         'title'         => __( 'Latest updates', 'buddypress' ),

src/bp-activity/bp-activity-filters.php

@@ -439 +439 @@
 
         $excerpt_length = bp_activity_get_excerpt_length();
 
-        $args = wp_parse_args( $args, array( 'ending' => __( '…', 'buddypress' ) ) );
+        $args = bp_parse_args( $args, array( 'ending' => __( '…', 'buddypress' ) ) );
 
         // Run the text through the excerpt function. If it's too short, the original text will be returned.
         $excerpt        = bp_create_excerpt( $text, $excerpt_length, $args );

src/bp-activity/bp-activity-functions.php

@@ -2021 +2021 @@
  */
 function bp_activity_post_update( $args = '' ) {
 
-        $r = wp_parse_args( $args, array(
+        $r = bp_parse_args( $args, array(
                 'content'    => false,
                 'user_id'    => bp_loggedin_user_id(),
                 'error_type' => 'bool',
@@ -2646 +2646 @@
 function bp_activity_new_comment( $args = '' ) {
         $bp = buddypress();
 
-        $r = wp_parse_args( $args, array(
+        $r = bp_parse_args( $args, array(
                 'id'                => false,
                 'content'           => false,
                 'user_id'           => bp_loggedin_user_id(),

src/bp-activity/bp-activity-template.php

@@ -1049 +1049 @@
                         'user_id' => false
                 );
 
-                $r = wp_parse_args( $args, $defaults );
+                $r = bp_parse_args( $args, $defaults );
                 extract( $r, EXTR_SKIP );
 
                 if ( !isset( $height ) && !isset( $width ) ) {
@@ -1152 +1152 @@
         function bp_get_activity_secondary_avatar( $args = '' ) {
                 global $activities_template;
 
-                $r = wp_parse_args( $args, array(
+                $r = bp_parse_args( $args, array(
                         'alt'        => '',
                         'type'       => 'thumb',
                         'width'      => 20,
@@ -1328 +1328 @@
         function bp_get_activity_action( $args = array() ) {
                 global $activities_template;
 
-                $r = wp_parse_args( $args, array(
+                $r = bp_parse_args( $args, array(
                         'no_timestamp' => false,
                 ) );
 
@@ -2812 +2812 @@
          */
         function bp_get_activity_filter_links( $args = false ) {
 
-                $r = wp_parse_args( $args, array(
+                $r = bp_parse_args( $args, array(
                         'style' => 'list'
                 ) );
 

src/bp-activity/classes/class-bp-activity-activity.php

@@ -413 +413 @@
                 }
 
                 $bp = buddypress();
-                $r  = wp_parse_args( $args, array(
+                $r  = bp_parse_args( $args, array(
                         'page'              => 1,               // The current page.
                         'per_page'          => 25,              // Activity items per page.
                         'max'               => false,           // Max number of items to return.
@@ -1257 +1257 @@
                 global $wpdb;
 
                 $bp = buddypress();
-                $r  = wp_parse_args( $args, array(
+                $r  = bp_parse_args( $args, array(
                         'id'                => false,
                         'action'            => false,
                         'content'           => false,

src/bp-activity/classes/class-bp-activity-feed.php

@@ -104 +104 @@
                         );
                 } else {
                         // Setup data.
-                        $this->data = wp_parse_args( $args, array(
+                        $this->data = bp_parse_args( $args, array(
                                 // Internal identifier for the RSS feed - should be alphanumeric only.
                                 'id'               => '',
 
@@ -196 +196 @@
                 $this->update_period    = strip_tags( $this->update_period );
                 $this->update_frequency = (int) $this->update_frequency;
 
-                $this->activity_args    = wp_parse_args( $this->activity_args, array(
+                $this->activity_args    = bp_parse_args( $this->activity_args, array(
                         'max'              => $this->max,
                         'per_page'         => $this->max,
                         'display_comments' => 'stream'

src/bp-activity/classes/class-bp-activity-template.php

@@ -186 +186 @@
                         'spam'              => 'ham_only',
                         'update_meta_cache' => true,
                 );
-                $r = wp_parse_args( $args, $defaults );
+                $r = bp_parse_args( $args, $defaults );
                 extract( $r );
 
                 $this->pag_arg  = sanitize_key( $r['page_arg'] );

src/bp-blogs/bp-blogs-activity.php

@@ -478 +478 @@
                 'hide_sitewide'     => false
         );
 
-        $r = wp_parse_args( $args, $defaults );
+        $r = bp_parse_args( $args, $defaults );
 
         if ( ! empty( $r['action'] ) ) {
 

src/bp-blogs/bp-blogs-blocks.php

@@ -21 +21 @@
  * @return string           HTML output.
  */
 function bp_blogs_render_recent_posts_block( $attributes = array() ) {
-        $block_args = wp_parse_args(
+        $block_args = bp_parse_args(
                 $attributes,
                 array(
                         'title'     => __( 'Recent Networkwide Posts', 'buddypress' ),

src/bp-blogs/bp-blogs-functions.php

@@ -1531 +1531 @@
                 'blog_public' => 0,
         );
 
-        $submitted_vars = wp_parse_args( $_POST, $exprected_vars );
+        $submitted_vars = bp_parse_args( $_POST, $exprected_vars );
 
         return array_map( 'wp_unslash', array_intersect_key( $submitted_vars, $exprected_vars ) );
 }

src/bp-blogs/bp-blogs-template.php

@@ -687 +687 @@
         function bp_get_blog_latest_post( $args = array() ) {
                 global $blogs_template;
 
-                $r = wp_parse_args( $args, array(
+                $r = bp_parse_args( $args, array(
                         'latest_format' => true,
                 ) );
 
@@ -1559 +1559 @@
                         'link_text'         => __( 'Visit Site', 'buddypress' ),
                 );
 
-                $button = wp_parse_args( $args, $defaults );
+                $button = bp_parse_args( $args, $defaults );
 
                 /**
                  * Filters the button for visiting a blog in a loop.

src/bp-blogs/classes/class-bp-blogs-recent-posts-widget.php

@@ -154 +154 @@
          * @return void
          */
         public function form( $instance ) {
-                $instance = wp_parse_args( (array) $instance, array(
+                $instance = bp_parse_args( (array) $instance, array(
                         'title'      => __( 'Recent Networkwide Posts', 'buddypress' ),
                         'max_posts'  => 10,
                         'link_title' => false,

src/bp-core/admin/bp-core-admin-types.php

@@ -181 +181 @@
         $metadata  = bp_core_admin_get_type_default_meta_values( $type_taxonomy );
 
         // Merge customs with defaults.
-        $metas = wp_parse_args( $args, $metadata );
+        $metas = bp_parse_args( $args, $metadata );
 
         // Validate metadata
         $metas = array_intersect_key( $metas, $metadata );

src/bp-core/bp-core-attachments.php

@@ -1021 +1021 @@
         }
 
         // Set default args.
-        $default_args = wp_parse_args(
+        $default_args = bp_parse_args(
                 $args,
                 array(
                         'components'    => array(),

src/bp-core/bp-core-avatars.php

@@ -231 +231 @@
         }
 
         // Set the default variables array and parse it against incoming $args array.
-        $params = wp_parse_args( $args, array(
+        $params = bp_parse_args( $args, array(
                 'item_id'       => false,
                 'object'        => 'user',
                 'type'          => 'thumb',
@@ -765 +765 @@
                 'avatar_dir' => false
         );
 
-        $args = wp_parse_args( $args, $defaults );
+        $args = bp_parse_args( $args, $defaults );
 
         /**
          * Filters whether or not to handle deleting an existing avatar.
@@ -1254 +1254 @@
  */
 function bp_core_avatar_handle_crop( $args = '' ) {
 
-        $r = wp_parse_args( $args, array(
+        $r = bp_parse_args( $args, array(
                 'object'        => 'user',
                 'avatar_dir'    => 'avatars',
                 'item_id'       => false,
@@ -1307 +1307 @@
         // Check the nonce.
         check_admin_referer( 'bp_avatar_cropstore', 'nonce' );
 
-        $avatar_data = wp_parse_args( $_POST, array(
+        $avatar_data = bp_parse_args( $_POST, array(
                 'crop_w' => bp_core_avatar_full_width(),
                 'crop_h' => bp_core_avatar_full_height(),
                 'crop_x' => 0,

src/bp-core/bp-core-blocks.php

@@ -257 +257 @@
  * @return string           HTML output.
  */
 function bp_block_render_login_form_block( $attributes = array() ) {
-        $block_args = wp_parse_args(
+        $block_args = bp_parse_args(
                 $attributes,
                 array(
                         'title' => '',

src/bp-core/bp-core-buddybar.php

@@ -53 +53 @@
                 'default_subnav_slug'     => false  // The slug of the default subnav item to select when clicked.
         );
 
-        $r = wp_parse_args( $args, $defaults );
+        $r = bp_parse_args( $args, $defaults );
 
         // Validate nav link data.
         $nav_item = bp_core_create_nav_link( $r, $component );
@@ -130 +130 @@
                 'default_subnav_slug'     => false  // The slug of the default subnav item to select when clicked.
         );
 
-        $r = wp_parse_args( $args, $defaults );
+        $r = bp_parse_args( $args, $defaults );
 
         // If we don't have the required info we need, don't create this nav item.
         if ( empty( $r['name'] ) || empty( $r['slug'] ) ) {
@@ -217 +217 @@
                 'default_subnav_slug'     => false  // The slug of the default subnav item to select when clicked.
         );
 
-        $r = wp_parse_args( $args, $defaults );
+        $r = bp_parse_args( $args, $defaults );
 
         // If we don't have the required info we need, don't register this screen function.
         if ( empty( $r['slug'] ) ) {
@@ -314 +314 @@
                 'subnav_slug'     => false  // The slug of the subnav item to select when clicked.
         );
 
-        $r = wp_parse_args( $args, $defaults );
+        $r = bp_parse_args( $args, $defaults );
 
         // This is specific to Members - it's not available in Groups.
         $parent_nav = $bp->members->nav->get_primary( array( 'slug' => $r['parent_slug'] ), false );
@@ -529 +529 @@
 function bp_core_create_subnav_link( $args = '', $component = 'members' ) {
         $bp = buddypress();
 
-        $r = wp_parse_args( $args, array(
+        $r = bp_parse_args( $args, array(
                 'name'              => false, // Display name for the nav item.
                 'slug'              => false, // URL slug for the nav item.
                 'parent_slug'       => false, // URL slug of the parent nav item.
@@ -625 +625 @@
 function bp_core_register_subnav_screen_function( $args = '', $component = 'members' ) {
         $bp = buddypress();
 
-        $r = wp_parse_args( $args, array(
+        $r = bp_parse_args( $args, array(
                 'slug'              => false, // URL slug for the screen.
                 'parent_slug'       => false, // URL slug of the parent screen.
                 'user_has_access'   => true,  // Can the user visit this screen?

src/bp-core/bp-core-cache.php

@@ -207 +207 @@
                 'object_column'    => '',      // DB column for the object ids (group_id, etc).
                 'cache_key_prefix' => ''       // Prefix to use when creating cache key names. Eg 'bp_groups_groupmeta'.
         );
-        $r = wp_parse_args( $args, $defaults );
+        $r = bp_parse_args( $args, $defaults );
         extract( $r );
 
         if ( empty( $object_ids ) || empty( $object_type ) || empty( $meta_table ) || empty( $cache_group ) ) {

src/bp-core/bp-core-catchuri.php

@@ -643 +643 @@
                 'message'  => __( 'You must log in to access the page you requested.', 'buddypress' )
         );
 
-        $r = wp_parse_args( $args, $defaults );
+        $r = bp_parse_args( $args, $defaults );
 
         /**
          * Filters the arguments used for user redirecting when visiting access controlled areas.
@@ -875 +875 @@
         $defaults = array(
                 'include_query_args' => false // Include URL arguments, eg ?foo=bar&foo2=bar2.
         );
-        $r = wp_parse_args( $args, $defaults );
+        $r = bp_parse_args( $args, $defaults );
         extract( $r );
 
         // Special case: when a BuddyPress directory (eg example.com/members)

src/bp-core/bp-core-functions.php

@@ -230 +230 @@
  *           'arg3' => array(),
  *           'arg4' => false,
  *       );
- *       $r = wp_parse_args( $args, $defaults ); // ...
+ *       $r = bp_parse_args( $args, $defaults ); // ...
  *
  * The first argument, $old_args_keys, is an array that matches the parameter positions (keys) to
  * the new $args keys (values):
@@ -290 +290 @@
         }
 
         // Passively filter the args before the parse.
-        if ( !empty( $filter_key ) ) {
+        if ( ! empty( $filter_key ) ) {
 
                 /**
                  * Filters the arguments key before parsing if filter key provided.
@@ -305 +305 @@
         }
 
         // Parse.
-        if ( is_array( $defaults ) && !empty( $defaults ) ) {
+        if ( is_array( $defaults ) && ! empty( $defaults ) ) {
                 $r = array_merge( $defaults, $r );
         }
 
         // Aggressively filter the args after the parse.
-        if ( !empty( $filter_key ) ) {
+        if ( ! empty( $filter_key ) ) {
 
                 /**
                  * Filters the arguments key after parsing if filter key provided.
@@ -1195 +1195 @@
  */
 function bp_core_time_diff( $args = array() ) {
         $retval = null;
-        $r      = wp_parse_args(
+        $r      = bp_parse_args(
                 $args,
                 array(
                         'older_date'     => 0,

src/bp-core/bp-core-template.php

@@ -3671 +3671 @@
                 'menu_id'         => '',
                 'walker'          => '',
         );
-        $args = wp_parse_args( $args, $defaults );
+        $args = bp_parse_args( $args, $defaults );
 
         /**
          * Filters the parsed bp_nav_menu arguments.

src/bp-core/bp-core-theme-compatibility.php

@@ -549 +549 @@
 
         // Switch defaults if post is set.
         if ( isset( $wp_query->post ) ) {
-                $dummy = wp_parse_args( $args, array(
+                $dummy = bp_parse_args( $args, array(
                         'ID'                    => $wp_query->post->ID,
                         'post_status'           => $wp_query->post->post_status,
                         'post_author'           => $wp_query->post->post_author,
@@ -582 +582 @@
                         'is_tax'                => false,
                 ) );
         } else {
-                $dummy = wp_parse_args( $args, array(
+                $dummy = bp_parse_args( $args, array(
                         'ID'                    => -9999,
                         'post_status'           => 'public',
                         'post_author'           => 0,

src/bp-core/classes/class-bp-button.php

@@ -236 +236 @@
          */
         public function __construct( $args = '' ) {
 
-                $r = wp_parse_args( $args, get_class_vars( __CLASS__ ) );
+                $r = bp_parse_args( $args, get_class_vars( __CLASS__ ) );
 
                 // Backward compatibility with deprecated parameters.
                 $r = $this->backward_compatibility_args( $r );

src/bp-core/classes/class-bp-component.php

@@ -234 +234 @@
          * }
          */
         public function setup_globals( $args = array() ) {
-                $r = wp_parse_args( $args, array(
+                $r = bp_parse_args( $args, array(
                         'slug'                  => $this->id,
                         'root_slug'             => '',
                         'has_directory'         => false,

src/bp-core/classes/class-bp-core-login-widget.php

@@ -174 +174 @@
          */
         public function form( $instance = array() ) {
 
-                $settings = wp_parse_args( $instance, array(
+                $settings = bp_parse_args( $instance, array(
                         'title' => '',
                 ) ); ?>
 

src/bp-core/classes/class-bp-core-nav.php

@@ -176 +176 @@
                         }
 
                         $nav_item = reset( $nav_items );
-                        $this->nav[ $this->object_id ][ $slug ] = new BP_Core_Nav_Item( wp_parse_args( $args, (array) $nav_item ) );
+                        $this->nav[ $this->object_id ][ $slug ] = new BP_Core_Nav_Item( bp_parse_args( $args, (array) $nav_item ) );
 
                         // Return the edited object.
                         return $this->nav[ $this->object_id ][ $slug ];
@@ -191 +191 @@
 
                         $sub_item = reset( $sub_items );
 
-                        $params = wp_parse_args( $args, (array) $sub_item );
+                        $params = bp_parse_args( $args, (array) $sub_item );
 
                         // When we have parents, it's for life, we can't change them!
                         if ( empty( $params['parent_slug'] ) || $parent_slug !== $params['parent_slug'] ) {
@@ -325 +325 @@
          * @return array The list of primary objects nav
          */
         public function get_primary( $args = array(), $sort = true ) {
-                $params = wp_parse_args( $args, array( 'primary' => true ) );
+                $params = bp_parse_args( $args, array( 'primary' => true ) );
 
                 // This parameter is not overridable.
                 if ( empty( $params['primary'] ) ) {
@@ -355 +355 @@
          * @return bool|array The list of secondary objects nav, or false if none set.
          */
         public function get_secondary( $args = array(), $sort = true ) {
-                $params = wp_parse_args( $args, array( 'parent_slug' => '' ) );
+                $params = bp_parse_args( $args, array( 'parent_slug' => '' ) );
 
                 // No need to search children if the parent is not set.
                 if ( empty( $params['parent_slug'] ) && empty( $params['secondary'] ) ) {

src/bp-core/classes/class-bp-core-oembed-extension.php

@@ -367 +367 @@
          * @return array
          */
         protected function get_oembed_response_data( $item, $width ) {
-                $data = wp_parse_args( $item, array(
+                $data = bp_parse_args( $item, array(
                         'version'       => '1.0',
                         'provider_name' => get_bloginfo( 'name' ),
                         'provider_url'  => get_home_url(),

src/bp-core/classes/class-bp-embed.php

@@ -80 +80 @@
                         return '';
 
                 $rawattr = $attr;
-                $attr = wp_parse_args( $attr, wp_embed_defaults() );
+                $attr = bp_parse_args( $attr, wp_embed_defaults() );
 
                 // Use kses to convert & into & and we need to undo this
                 // See https://core.trac.wordpress.org/ticket/11311.

src/bp-core/classes/class-bp-suggestions.php

@@ -80 +80 @@
          * }
          */
         public function set_query( array $args = array() ) {
-                $this->args = wp_parse_args( $args, $this->default_args );
+                $this->args = bp_parse_args( $args, $this->default_args );
         }
 
         /**

src/bp-core/classes/class-bp-user-query.php

@@ -154 +154 @@
                 $this->setup_hooks();
 
                 if ( ! empty( $this->query_vars_raw ) ) {
-                        $this->query_vars = wp_parse_args( $this->query_vars_raw, array(
+                        $this->query_vars = bp_parse_args( $this->query_vars_raw, array(
                                 'type'                => 'newest',
                                 'per_page'            => 0,
                                 'page'                => 1,

src/bp-core/deprecated/1.2.php

@@ -44 +44 @@
                 'filter' => array()
         );
 
-        $args = wp_parse_args( $args, $defaults );
+        $args = bp_parse_args( $args, $defaults );
 
         return apply_filters( 'bp_activity_get_sitewide', BP_Activity_Activity::get( $args ), $r );
 }

src/bp-core/deprecated/1.5.php

@@ -97 +97 @@
                 'position'     => 100
         );
 
-        $r = wp_parse_args( $args, $defaults );
+        $r = bp_parse_args( $args, $defaults );
         extract( $r, EXTR_SKIP );
 
         $file     = plugin_basename( $file );

src/bp-friends/bp-friends-activity.php

@@ -39 +39 @@
                 return false;
         }
 
-        $r = wp_parse_args( $args, array(
+        $r = bp_parse_args( $args, array(
                 'user_id'           => bp_loggedin_user_id(),
                 'action'            => '',
                 'content'           => '',

src/bp-friends/bp-friends-blocks.php

@@ -44 +44 @@
  * @return string           HTML output.
  */
 function bp_friends_render_friends_block( $attributes = array() ) {
-        $block_args = wp_parse_args(
+        $block_args = bp_parse_args(
                 $attributes,
                 array(
                         'maxFriends'    => 5,

src/bp-friends/classes/class-bp-core-friends-widget.php

@@ -184 +184 @@
                         'link_title'     => false,
                 );
 
-                $instance       = wp_parse_args( (array) $instance, $defaults );
+                $instance       = bp_parse_args( (array) $instance, $defaults );
                 $max_friends    = $instance['max_friends'];
                 $friend_default = $instance['friend_default'];
                 $link_title     = (bool) $instance['link_title'];

src/bp-groups/bp-groups-blocks.php

@@ -23 +23 @@
 function bp_groups_render_group_block( $attributes = array() ) {
         $bp = buddypress();
 
-        $block_args = wp_parse_args(
+        $block_args = bp_parse_args(
                 $attributes,
                 array(
                         'itemID'              => 0,
@@ -190 +190 @@
 function bp_groups_render_groups_block( $attributes = array() ) {
         $bp = buddypress();
 
-        $block_args = wp_parse_args(
+        $block_args = bp_parse_args(
                 $attributes,
                 array(
                         'itemIDs'          => array(),
@@ -345 +345 @@
  * @return string           HTML output.
  */
 function bp_groups_render_dynamic_groups_block( $attributes = array() ) {
-        $block_args = wp_parse_args(
+        $block_args = bp_parse_args(
                 $attributes,
                 array(
                         'title'        => __( 'Groups', 'buddypress' ),

src/bp-groups/bp-groups-template.php

@@ -277 +277 @@
                         );
                 }
 
-                $labels = wp_parse_args(
+                $labels = bp_parse_args(
                         $r['label'],
                         array(
                                 'plural'   => __( 'Group Types:', 'buddypress' ),

src/bp-members/bp-members-blocks.php

@@ -23 +23 @@
 function bp_members_render_member_block( $attributes = array() ) {
         $bp = buddypress();
 
-        $block_args = wp_parse_args(
+        $block_args = bp_parse_args(
                 $attributes,
                 array(
                         'itemID'              => 0,
@@ -180 +180 @@
 function bp_members_render_members_block( $attributes = array() ) {
         $bp = buddypress();
 
-        $block_args = wp_parse_args(
+        $block_args = bp_parse_args(
                 $attributes,
                 array(
                         'itemIDs'            => array(),
@@ -366 +366 @@
  * @return string           HTML output.
  */
 function bp_members_render_dynamic_members_block( $attributes = array() ) {
-        $block_args = wp_parse_args(
+        $block_args = bp_parse_args(
                 $attributes,
                 array(
                         'title'         => __( 'Members', 'buddypress' ),

src/bp-members/bp-members-template.php

@@ -827 +827 @@
                         'alt'    => sprintf( __( 'Profile picture of %s', 'buddypress' ), $fullname )
                 );
 
-                $r = wp_parse_args( $args, $defaults );
+                $r = bp_parse_args( $args, $defaults );
                 extract( $r, EXTR_SKIP );
 
                 /**
@@ -1047 +1047 @@
                         'view_link' => true
                 );
 
-                $r = wp_parse_args( $args, $defaults );
+                $r = bp_parse_args( $args, $defaults );
                 extract( $r );
 
                 if ( !bp_is_active( 'activity' ) || empty( $members_template->member->latest_update ) || !$update = maybe_unserialize( $members_template->member->latest_update ) )
@@ -1140 +1140 @@
                         'user_id' => $default_user_id,
                 );
 
-                $r = wp_parse_args( $args, $defaults );
+                $r = bp_parse_args( $args, $defaults );
 
                 // If we're in a members loop, get the data from the global.
                 if ( ! empty( $members_template->member->profile_data ) ) {
@@ -1220 +1220 @@
         function bp_get_member_registered( $args = array() ) {
                 global $members_template;
 
-                $r = wp_parse_args( $args, array(
+                $r = bp_parse_args( $args, array(
                         'relative' => true,
                 ) );
 
@@ -1575 +1575 @@
          */
         function bp_get_loggedin_user_avatar( $args = '' ) {
 
-                $r = wp_parse_args( $args, array(
+                $r = bp_parse_args( $args, array(
                         'item_id' => bp_loggedin_user_id(),
                         'type'    => 'thumb',
                         'width'   => false,
@@ -1630 +1630 @@
          */
         function bp_get_displayed_user_avatar( $args = '' ) {
 
-                $r = wp_parse_args( $args, array(
+                $r = bp_parse_args( $args, array(
                         'item_id' => bp_displayed_user_id(),
                         'type'    => 'thumb',
                         'width'   => false,
@@ -2153 +2153 @@
                 // Should the label be output?
                 $has_label = ! empty( $r['label'] );
 
-                $labels = wp_parse_args(
+                $labels = bp_parse_args(
                         $r['label'],
                         array(
                                 'plural'   => __( 'Member Types:', 'buddypress' ),
@@ -2711 +2711 @@
                         'alt' => __( 'Your Profile Photo', 'buddypress' )
                 );
 
-                $r = wp_parse_args( $args, $defaults );
+                $r = bp_parse_args( $args, $defaults );
                 extract( $r, EXTR_SKIP );
 
                 // Avatar DIR is found.
@@ -3189 +3189 @@
                 $inviter_id = isset( $args['inviter_id'] ) ? $args['inviter_id'] : bp_displayed_user_id();
 
                 // Parse.
-                $r = wp_parse_args( $args, array(
+                $r = bp_parse_args( $args, array(
                         'before' => '',
                         'after'  => '',
                         'sep'    => ' | ',

src/bp-members/classes/class-bp-core-members-template.php

@@ -173 +173 @@
                         'member_type__not_in' => '',
                         'xprofile_query'      => false,
                 );
-                $r = wp_parse_args( $args, $defaults );
+                $r = bp_parse_args( $args, $defaults );
 
                 $this->pag_arg  = sanitize_key( $r['page_arg'] );
                 $this->pag_page = bp_sanitize_pagination_arg( $this->pag_arg, $r['page_number'] );

src/bp-members/classes/class-bp-members-invitations-template.php

@@ -162 +162 @@
         public function __construct( $args = array() ) {
 
                 // Parse arguments.
-                $r = wp_parse_args(
+                $r = bp_parse_args(
                         $args,
                         array(
                                 'id'            => false,

src/bp-members/classes/class-bp-signup.php

@@ -730 +730 @@
 
                 // Figure out which meta keys should be updated.
                 $signup       = new BP_Signup( $signup_id );
-                $blended_meta = wp_parse_args( $r['meta'], $signup->meta );
+                $blended_meta = bp_parse_args( $r['meta'], $signup->meta );
 
                 $wpdb->update(
                         // Signups table.

src/bp-members/screens/invitations.php

@@ -27 +27 @@
                         'send_invite'   => 1,
                 );
 
-                $invite_args = wp_parse_args( array_map( 'wp_unslash', $_REQUEST ), $default_args );
+                $invite_args = bp_parse_args( array_map( 'wp_unslash', $_REQUEST ), $default_args );
                 $invite_args = array_intersect_key( $invite_args, $default_args );
 
                 // Check the nonce and delete the invitation.

src/bp-messages/bp-messages-star.php

@@ -247 +247 @@
  * @return bool
  */
 function bp_messages_star_set_action( $args = array() ) {
-        $r = wp_parse_args( $args, array(
+        $r = bp_parse_args( $args, array(
                 'action'     => 'star',
                 'thread_id'  => 0,
                 'message_id' => 0,

src/bp-messages/classes/class-bp-messages-box-template.php

@@ -126 +126 @@
                         $args = bp_core_parse_args_array( $old_args_keys, $function_args );
                 }
 
-                $r = wp_parse_args( $args, array(
+                $r = bp_parse_args( $args, array(
                         'page'         => 1,
                         'per_page'     => 10,
                         'page_arg'     => 'mpage',

src/bp-messages/classes/class-bp-messages-notice.php

@@ -240 +240 @@
         public static function get_notices( $args = array() ) {
                 global $wpdb;
 
-                $r = wp_parse_args( $args, array(
+                $r = bp_parse_args( $args, array(
                         'pag_num'  => 20, // Number of notices per page.
                         'pag_page' => 1   // Page number.
                 ) );

src/bp-messages/classes/class-bp-messages-notices-admin.php

@@ -126 +126 @@
 
                         check_admin_referer( 'new-notice', 'ns-nonce' );
 
-                        $notice = wp_parse_args( $_POST['bp_notice'], array(
+                        $notice = bp_parse_args( $_POST['bp_notice'], array(
                                 'subject' => '',
                                 'content' => ''
                         ) );

src/bp-messages/classes/class-bp-messages-sitewide-notices-widget.php

@@ -108 +108 @@
          * @param array $instance See {@WP_Widget::form()}.
          */
         public function form( $instance ) {
-                $instance = wp_parse_args( (array) $instance, array(
+                $instance = bp_parse_args( (array) $instance, array(
                         'title' => '',
                 ) );
 

src/bp-messages/classes/class-bp-messages-thread.php

@@ -170 +170 @@
                         bp_loggedin_user_id();
 
                 // Merge $args with our defaults.
-                $r = wp_parse_args(
+                $r = bp_parse_args(
                         $args,
                         array(
                                 'user_id'             => $user_id,
@@ -283 +283 @@
                 }
 
                 $bp = buddypress();
-                $r  = wp_parse_args(
+                $r  = bp_parse_args(
                         $args,
                         array(
                                 'recipients_page'     => null,
@@ -364 +364 @@
                 }
 
                 $bp = buddypress();
-                $r  = wp_parse_args(
+                $r  = bp_parse_args(
                         $args,
                         array(
                                 'page'     => null,

src/bp-notifications/bp-notifications-template.php

@@ -885 +885 @@
                 $user_id = isset( $args['user_id'] ) ? $args['user_id'] : bp_displayed_user_id();
 
                 // Parse.
-                $r = wp_parse_args( $args, array(
+                $r = bp_parse_args( $args, array(
                         'before' => '',
                         'after'  => '',
                         'sep'    => ' | ',

src/bp-notifications/classes/class-bp-notifications-notification.php

@@ -616 +616 @@
          * @return array
          */
         public static function parse_args( $args = '' ) {
-                return wp_parse_args( $args, array(
+                return bp_parse_args( $args, array(
                         'id'                => false,
                         'user_id'           => false,
                         'item_id'           => false,
@@ -1030 +1030 @@
          * }
          */
         public static function get_current_notifications_for_user( $args = array() ) {
-                $r = wp_parse_args( $args, array(
+                $r = bp_parse_args( $args, array(
                         'user_id'      => bp_loggedin_user_id(),
                         'is_new'       => true,
                         'page'         => 1,

src/bp-notifications/classes/class-bp-notifications-template.php

@@ -152 +152 @@
         public function __construct( $args = array() ) {
 
                 // Parse arguments.
-                $r = wp_parse_args( $args, array(
+                $r = bp_parse_args( $args, array(
                         'id'                => false,
                         'user_id'           => 0,
                         'item_id'           => false,

src/bp-templates/bp-legacy/buddypress-functions.php

@@ -700 +700 @@
 
         // Set up the cookies passed on this AJAX request. Store a local var to avoid conflicts.
         if ( ! empty( $_POST['cookie'] ) ) {
-                $_BP_COOKIE = wp_parse_args( str_replace( '; ', '&', urldecode( $_POST['cookie'] ) ) );
+                $_BP_COOKIE = bp_parse_args( str_replace( '; ', '&', urldecode( $_POST['cookie'] ) ) );
         } else {
                 $_BP_COOKIE = &$_COOKIE;
         }

src/bp-xprofile/bp-xprofile-functions.php

@@ -230 +230 @@
  */
 function xprofile_insert_field( $args = '' ) {
 
-        $r = wp_parse_args( $args, array(
+        $r = bp_parse_args( $args, array(
                 'field_id'          => null,
                 'field_group_id'    => null,
                 'parent_id'         => null,

src/bp-xprofile/bp-xprofile-template.php

@@ -954 +954 @@
          */
         function bp_get_profile_field_data( $args = '' ) {
 
-                $r = wp_parse_args( $args, array(
+                $r = bp_parse_args( $args, array(
                         'field'   => false, // Field name or ID.
                         'user_id' => bp_displayed_user_id()
                 ) );

src/bp-xprofile/classes/class-bp-xprofile-data-template.php

@@ -148 +148 @@
                         $args = bp_core_parse_args_array( $old_args_keys, $function_args );
                 }
 
-                $r = wp_parse_args( $args, array(
+                $r = bp_parse_args( $args, array(
                         'profile_group_id'       => false,
                         'user_id'                => false,
                         'member_type'            => 'any',

src/bp-xprofile/classes/class-bp-xprofile-field-type-checkbox-acceptance.php

@@ -243 +243 @@
          */
         public function edit_field_options_html( array $args = array() ) {
                 $field_id            = (int) $this->field_obj->id;
-                $params              = wp_parse_args( $args, array( 'user_id' => bp_displayed_user_id() ) );
+                $params              = bp_parse_args( $args, array( 'user_id' => bp_displayed_user_id() ) );
                 $checkbox_acceptance = (int) maybe_unserialize( \BP_XProfile_ProfileData::get_value_byid( $field_id, $params['user_id'] ) );
 
                 if ( ! empty( $_POST[ 'field_' . $field_id ] ) ) {

src/bp-xprofile/classes/class-bp-xprofile-field-type-textarea.php

@@ -74 +74 @@
                 do_action( bp_get_the_profile_field_errors_action() );
 
                 if ( ! $richtext_enabled ) {
-                        $r = wp_parse_args( $raw_properties, array(
+                        $r = bp_parse_args( $raw_properties, array(
                                 'cols' => 40,
                                 'rows' => 5,
                         ) );

src/bp-xprofile/classes/class-bp-xprofile-field-type-wordpress-biography.php

@@ -111 +111 @@
                 /** This action is documented in bp-xprofile/bp-xprofile-classes */
                 do_action( bp_get_the_profile_field_errors_action() );
 
-                $r = wp_parse_args( $raw_properties, array(
+                $r = bp_parse_args( $raw_properties, array(
                         'cols' => 40,
                         'rows' => 5,
                 ) );

src/bp-xprofile/classes/class-bp-xprofile-field-type-wordpress-textbox.php

@@ -160 +160 @@
                         $field_value = bp_get_user_meta( $user_id, $this->wp_user_key, true );
                 }
 
-                $r = wp_parse_args( $raw_properties, array(
+                $r = bp_parse_args( $raw_properties, array(
                         'type'  => 'text',
                         'value' => $this->sanitize_for_output( $field_value, $user_id ),
                 ) );
@@ -195 +195 @@
          * @param array $raw_properties Optional key/value array of permitted attributes that you want to add.
          */
         public function admin_field_html( array $raw_properties = array() ) {
-                $r = wp_parse_args( $raw_properties, array(
+                $r = bp_parse_args( $raw_properties, array(
                         'type' => 'text'
                 ) ); ?>
 

src/bp-xprofile/classes/class-bp-xprofile-group.php

@@ -271 +271 @@
                 global $wpdb;
 
                 // Parse arguments.
-                $r = wp_parse_args( $args, array(
+                $r = bp_parse_args( $args, array(
                         'profile_group_id'       => false,
                         'user_id'                => bp_displayed_user_id(),
                         'member_type'            => false,

tests/phpunit/assets/class-bptest-component.php

@@ -11 +11 @@
 
         // Start the `test` component setup process.
         public function __construct( $args = array() ) {
-                $r = wp_parse_args(
+                $r = bp_parse_args(
                         $args,
                         array(
                                 'id'      => 'example',

tests/phpunit/includes/factory.php

@@ -27 +27 @@
          * Also set a display name
          */
         public function create_object( $args ) {
-                $r = wp_parse_args( $args, array(
+                $r = bp_parse_args( $args, array(
                         'role' => 'subscriber',
                         'last_activity' => date( 'Y-m-d H:i:s', strtotime( bp_core_current_time() ) - 60*60*24*365 ),
                 ) );

tests/phpunit/includes/testcase.php

@@ -220 +220 @@
         }
 
         public static function add_user_to_group( $user_id, $group_id, $args = array() ) {
-                $r = wp_parse_args( $args, array(
+                $r = bp_parse_args( $args, array(
                         'date_modified' => bp_core_current_time(),
                         'is_confirmed'  => 1,
                         'is_admin'      => 0,