Changeset 12107

Timestamp:

05/21/2018 01:14:05 AM (8 years ago)

Author:

djpaul

Message:

Templates, Nouveau: use bp_parse_args instead of wp_parse_args.

Location:

trunk/src/bp-templates/bp-nouveau

Files:

• buddypress-functions.php (modified) (3 diffs)
• includes/activity/template-tags.php (modified) (1 diff)
• includes/activity/widgets.php (modified) (1 diff)
• includes/classes.php (modified) (4 diffs)
• includes/functions.php (modified) (3 diffs)
• includes/groups/ajax.php (modified) (1 diff)
• includes/groups/classes.php (modified) (1 diff)
• includes/notifications/functions.php (modified) (1 diff)
• includes/template-tags.php (modified) (1 diff)

trunk/src/bp-templates/bp-nouveau/buddypress-functions.php

@@ -267 +267 @@
                 }
 
-                $data = wp_parse_args( $style, array(
-                    'dependencies' => array(),
-                    'version'      => $this->version,
-                    'type'         => 'screen',
-                ) );
+                $data = bp_parse_args(
+                    $style,
+                    array(
+                        'dependencies' => array(),
+                        'version'      => $this->version,
+                        'type'         => 'screen',
+                    ),
+                    'nouveau_enqueue_styles'
+                );
 
                 wp_enqueue_style( $handle, $file, $data['dependencies'], $data['version'], $data['type'] );
@@ -346 +350 @@
             }
 
-            $data = wp_parse_args( $script, array(
-                'dependencies' => array(),
-                'version'      => $this->version,
-                'footer'       => false,
-            ) );
+            $data = bp_parse_args(
+                $script,
+                array(
+                    'dependencies' => array(),
+                    'version'      => $this->version,
+                    'footer'       => false,
+                ),
+                'nouveau_register_scripts'
+            );
 
             wp_register_script( $handle, $file, $data['dependencies'], $data['version'], $data['footer'] );
@@ -628 +636 @@
             return $path;
         } else {
-            $vars = wp_parse_args( $uri['query'], array() );
+            $vars = bp_parse_args(
+                $uri['query'],
+                array(),
+                'customizer_set_uri'
+            );
 
             if ( ! empty( $vars['url'] ) ) {

trunk/src/bp-templates/bp-nouveau/includes/activity/template-tags.php

@@ -436 +436 @@
             }
 
-            $delete_args = wp_parse_args( $delete_args, array(
-                'link_text'   => '',
-                'button_attr' => array(
-                    'link_id'         => '',
-                    'link_href'       => '',
-                    'link_class'      => '',
-                    'link_rel'        => 'nofollow',
-                    'data_bp_tooltip' => '',
+            $delete_args = bp_parse_args(
+                $delete_args,
+                array(
+                    'link_text'   => '',
+                    'button_attr' => array(
+                        'link_id'         => '',
+                        'link_href'       => '',
+                        'link_class'      => '',
+                        'link_rel'        => 'nofollow',
+                        'data_bp_tooltip' => '',
+                    ),
                 ),
-            ) );
+                'nouveau_get_activity_entry_buttons'
+            );
         }
 

trunk/src/bp-templates/bp-nouveau/includes/activity/widgets.php

@@ -166 +166 @@
      */
     public function form( $instance ) {
-        $instance = wp_parse_args( (array) $instance, array(
-            'title' => __( 'Latest updates', 'buddypress' ),
-            'max'   => 5,
-            'type'  => '',
-        ) );
+        $instance = bp_parse_args(
+            (array) $instance,
+            array(
+                'title' => __( 'Latest updates', 'buddypress' ),
+                'max'   => 5,
+                'type'  => '',
+            ),
+            'widget_latest_activities'
+        );
 
         $title = esc_attr( $instance['title'] );

trunk/src/bp-templates/bp-nouveau/includes/classes.php

@@ -45 +45 @@
     public function __construct( $args = array() ) {
         foreach ( $args as $arg ) {
-            $r = wp_parse_args( (array) $arg, array(
-                'id'                => '',
-                'position'          => 99,
-                'component'         => '',
-                'must_be_logged_in' => true,
-                'block_self'        => false,
-                'parent_element'    => false,
-                'parent_attr'       => array(),
-                'button_element'    => 'a',
-                'button_attr'       => array(),
-                'link_text'         => '',
-            ) );
+            $r = bp_parse_args(
+                (array) $arg,
+                array(
+                    'id'                => '',
+                    'position'          => 99,
+                    'component'         => '',
+                    'must_be_logged_in' => true,
+                    'block_self'        => false,
+                    'parent_element'    => false,
+                    'parent_attr'       => array(),
+                    'button_element'    => 'a',
+                    'button_attr'       => array(),
+                    'link_text'         => '',
+                ),
+                'buttons_group_constructor'
+            );
 
             // Just don't set the button if a param is missing
@@ -164 +168 @@
         foreach ( $args as $id => $params ) {
             if ( isset( $this->group[ $id ] ) ) {
-                $this->group[ $id ] = wp_parse_args( $params, $this->group[ $id ] );
+                $this->group[ $id ] = bp_parse_args(
+                    $params,
+                    $this->group[ $id ],
+                    'buttons_group_update'
+                );
             }
         }
@@ -229 +237 @@
          * }
          */
-        $item_nav_args = wp_parse_args( $instance, apply_filters( 'bp_nouveau_object_nav_widget_args', array(
-            'bp_nouveau_widget_title' => true,
-        ) ) );
+        $item_nav_args = bp_parse_args(
+            $instance,
+            apply_filters(
+                'bp_nouveau_object_nav_widget_args',
+                array( 'bp_nouveau_widget_title' => true )
+            ),
+            'widget_object_nav'
+        );
 
         $title = '';
@@ -304 +317 @@
         );
 
-        $instance = wp_parse_args( (array) $instance, $defaults );
+        $instance = bp_parse_args(
+            (array) $instance,
+            $defaults,
+            'widget_object_nav_form'
+        );
 
         $bp_nouveau_widget_title = (bool) $instance['bp_nouveau_widget_title'];

trunk/src/bp-templates/bp-nouveau/includes/functions.php

@@ -45 +45 @@
 
     if ( ! empty( $_POST ) ) {
-        $post_query = wp_parse_args( $_POST, $post_query );
+        $post_query = bp_parse_args(
+            $_POST,
+            $post_query,
+            'nouveau_ajax_querystring'
+        );
 
         // Make sure to transport the scope, filter etc.. in HeartBeat Requests
@@ -53 +57 @@
             // Remove heartbeat specific vars
             $post_query = array_diff_key(
-                wp_parse_args( $bp_heartbeat, $post_query ),
+                bp_parse_args(
+                    $bp_heartbeat,
+                    $post_query,
+                    'nouveau_ajax_querystring_heartbeat'
+                ),
                 array(
                     'data'      => false,
@@ -243 +251 @@
     }
 
-    $r = wp_parse_args( $args, array(
-        'container'         => 'div',
-        'container_id'      => '',
-        'container_classes' => array( $generic_class, $current_component_class   ),
-        'output'            => '',
-    ) );
+    $r = bp_parse_args(
+        $args,
+        array(
+            'container'         => 'div',
+            'container_id'      => '',
+            'container_classes' => array( $generic_class, $current_component_class   ),
+            'output'            => '',
+        ),
+        'nouveau_wrapper'
+    );
 
     $valid_containers = array(

trunk/src/bp-templates/bp-nouveau/includes/groups/ajax.php

@@ -278 +278 @@
     }
 
-    $request = wp_parse_args( $_POST, array(
-        'scope' => 'members',
-    ) );
+    $request = bp_parse_args(
+        $_POST,
+        array(
+            'scope' => 'members',
+        ),
+        'nouveau_ajax_get_users_to_invite'
+    );
 
     $bp->groups->invites_scope = 'members';

trunk/src/bp-templates/bp-nouveau/includes/groups/classes.php

@@ -40 +40 @@
      */
     public function build_exclude_args() {
-        $this->query_vars = wp_parse_args( $this->query_vars, array(
-            'group_id'     => 0,
-            'is_confirmed' => true,
-        ) );
+        $this->query_vars = bp_parse_args(
+            $this->query_vars,
+            array(
+                'group_id'     => 0,
+                'is_confirmed' => true,
+            ),
+            'nouveau_group_invite_query_exlude_args'
+        );
 
         $group_member_ids = $this->get_group_member_ids();

trunk/src/bp-templates/bp-nouveau/includes/notifications/functions.php

@@ -85 +85 @@
     $bp_nouveau = bp_nouveau();
 
-    $r = wp_parse_args( $args, array(
-        'id'       => '',
-        'label'    => '',
-        'position' => 99,
-    ) );
+    $r = bp_parse_args(
+        $args,
+        array(
+            'id'       => '',
+            'label'    => '',
+            'position' => 99,
+        ),
+        'nouveau_notifications_register_filter'
+    );
 
     if ( empty( $r['id'] ) || empty( $r['label'] ) ) {

trunk/src/bp-templates/bp-nouveau/includes/template-tags.php

@@ -709 +709 @@
     $bp_nouveau = bp_nouveau();
 
-    $n = wp_parse_args( $args, array(
-        'type'                    => 'primary',
-        'object'                  => '',
-        'user_has_access'         => true,
-        'show_for_displayed_user' => true,
-    ) );
+    $n = bp_parse_args(
+        $args,
+        array(
+            'type'                    => 'primary',
+            'object'                  => '',
+            'user_has_access'         => true,
+            'show_for_displayed_user' => true,
+        ),
+        'nouveau_has_nav'
+    );
 
     if ( empty( $n['type'] ) ) {