Changeset 13108 for trunk/src/bp-core/bp-core-attachments.php

Timestamp:

09/12/2021 08:43:39 PM (3 years ago)

Author:

espellcaste

Message:

Update all references from wp_parse_args to bp_parse_args.

Also, add WPCS improvements to align bp_parse_args correctly.

Props imath
Fixes #8564

File:

• trunk/src/bp-core/bp-core-attachments.php (modified) (7 diffs)

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

@@ -92 +92 @@
     }
 
-    $r = bp_parse_args( $args, array(
-        'object_id' => $object_id,
-        'object_directory' => $object_directory,
-    ), 'cover_image_upload_dir' );
-
+    $r = bp_parse_args(
+        $args,
+        array(
+            'object_id'        => $object_id,
+            'object_directory' => $object_directory,
+        ),
+        'cover_image_upload_dir'
+    );
 
     // Set the subdir.
@@ -287 +290 @@
     }
 
-    $r = bp_parse_args( $args, array(
-        'item_id'   => 0,
-        'object'    => 'user',
-        'component' => '',
-        'image'     => '',
-        'crop_w'    => 0,
-        'crop_h'    => 0,
-        'crop_x'    => 0,
-        'crop_y'    => 0
-    ), 'create_item_' . $type );
+    $r = bp_parse_args(
+        $args,
+        array(
+            'item_id'   => 0,
+            'object'    => 'user',
+            'component' => '',
+            'image'     => '',
+            'crop_w'    => 0,
+            'crop_h'    => 0,
+            'crop_x'    => 0,
+            'crop_y'    => 0,
+        ),
+        'create_item_' . $type
+    );
 
     if ( empty( $r['item_id'] ) || empty( $r['object'] ) || ! file_exists( $r['image'] ) || ! @getimagesize( $r['image'] ) ) {
@@ -446 +453 @@
     $attachment_data = false;
 
-    $r = bp_parse_args( $args, array(
-        'object_dir' => 'members',
-        'item_id'    => bp_loggedin_user_id(),
-        'type'       => 'cover-image',
-        'file'       => '',
-    ), 'attachments_get_attachment_src' );
+    $r = bp_parse_args(
+        $args,
+        array(
+            'object_dir' => 'members',
+            'item_id'    => bp_loggedin_user_id(),
+            'type'       => 'cover-image',
+            'file'       => '',
+        ),
+        'attachments_get_attachment_src'
+    );
 
     /**
@@ -698 +709 @@
 
     // Get an instance of the class and get the script data.
-    $attachment = new $class;
-    $script_data  = $attachment->script_data();
-
-    $args = bp_parse_args( $script_data, array(
-        'action'            => '',
-        'file_data_name'    => '',
-        'max_file_size'     => 0,
-        'browse_button'     => 'bp-browse-button',
-        'container'         => 'bp-upload-ui',
-        'drop_element'      => 'drag-drop-area',
-        'bp_params'         => array(),
-        'extra_css'         => array(),
-        'extra_js'          => array(),
-        'feedback_messages' => array(),
-    ), 'attachments_enqueue_scripts' );
+    $attachment  = new $class;
+    $script_data = $attachment->script_data();
+
+    $args = bp_parse_args(
+        $script_data,
+        array(
+            'action'            => '',
+            'file_data_name'    => '',
+            'max_file_size'     => 0,
+            'browse_button'     => 'bp-browse-button',
+            'container'         => 'bp-upload-ui',
+            'drop_element'      => 'drag-drop-area',
+            'bp_params'         => array(),
+            'extra_css'         => array(),
+            'extra_js'          => array(),
+            'feedback_messages' => array(),
+        ),
+        'attachments_enqueue_scripts'
+    );
 
     if ( empty( $args['action'] ) || empty( $args['file_data_name'] ) ) {
@@ -1022 +1037 @@
 
     // Set default args.
-    $default_args = wp_parse_args(
+    $default_args = bp_parse_args(
         $args,
         array(
@@ -1050 +1065 @@
      * @param array $settings The cover image settings
      */
-    $settings = bp_parse_args( $args, $default_args, $component . '_cover_image_settings' );
+    $settings = bp_parse_args(
+        $args,
+        $default_args,
+        $component . '_cover_image_settings'
+    );
 
     // Handle deprecated xProfile fitler.
@@ -1282 +1301 @@
     }
 
-    $bp_params = bp_parse_args( $_POST['bp_params'], array(
-        'object'  => 'user',
-        'item_id' => bp_loggedin_user_id(),
-    ), 'attachments_cover_image_ajax_upload' );
+    $bp_params = bp_parse_args(
+        $_POST['bp_params'],
+        array(
+            'object'  => 'user',
+            'item_id' => bp_loggedin_user_id(),
+        ),
+        'attachments_cover_image_ajax_upload'
+    );
 
     $bp_params['item_id'] = (int) $bp_params['item_id'];