Changeset 14055 for branches/11.0/src/bp-core/bp-core-avatars.php

Timestamp:

10/22/2024 08:59:52 PM (17 months ago)

Author:

imath

Message:

11.4.3 version bumps (branch 11.0)

File:

• branches/11.0/src/bp-core/bp-core-avatars.php (modified) (9 diffs)

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

@@ -1185 +1185 @@
  */
 function bp_avatar_handle_capture( $data = '', $item_id = 0, $return = 'boolean' ) {
+    $return  = $retval;
+    $item_id = (int) $item_id;
+
     if ( empty( $data ) || empty( $item_id ) ) {
         return false;
@@ -1352 +1355 @@
     }
 
+    // Sanitize object id.
+    $item_id = (int) $avatar_data['item_id'];
+
     // Capability check.
     if ( ! bp_attachments_current_user_can( 'edit_avatar', $avatar_data ) ) {
@@ -1365 +1371 @@
         }
 
-        $cropped_webcam_avatar = bp_avatar_handle_capture( $webcam_avatar, $avatar_data['item_id'], 'array' );
+        $cropped_webcam_avatar = bp_avatar_handle_capture( $webcam_avatar, $item_id, 'array' );
 
         if ( ! $cropped_webcam_avatar ) {
@@ -1378 +1384 @@
                         array(
                             'object'  => $avatar_data['object'],
-                            'item_id' => $avatar_data['item_id'],
+                            'item_id' => $item_id,
                             'html'    => false,
                             'type'    => 'full',
@@ -1385 +1391 @@
                 ),
                 'feedback_code' => 2,
-                'item_id'       => $avatar_data['item_id'],
+                'item_id'       => $item_id,
             );
 
             /** This action is documented in wp-includes/deprecated.php */
-            do_action_deprecated( 'xprofile_avatar_uploaded', array( (int) $avatar_data['item_id'], $avatar_data['type'], $avatar_data ), '6.0.0', 'bp_members_avatar_uploaded' );
+            do_action_deprecated( 'xprofile_avatar_uploaded', array( $item_id, $avatar_data['type'], $avatar_data ), '6.0.0', 'bp_members_avatar_uploaded' );
 
             /**
@@ -1402 +1408 @@
              * @param array  $cropped_webcam_avatar Array containing the full, thumb avatar and the timestamp.
              */
-            do_action( 'bp_members_avatar_uploaded', (int) $avatar_data['item_id'], $avatar_data['type'], $avatar_data, $cropped_webcam_avatar );
+            do_action( 'bp_members_avatar_uploaded', $item_id, $avatar_data['type'], $avatar_data, $cropped_webcam_avatar );
 
             wp_send_json_success( $return );
@@ -1423 +1429 @@
     // Crop args.
     $r = array(
-        'item_id'       => $avatar_data['item_id'],
+        'item_id'       => $item_id,
         'object'        => $avatar_data['object'],
         'avatar_dir'    => $avatar_dir,
@@ -1442 +1448 @@
                     array(
                         'object'  => $avatar_data['object'],
-                        'item_id' => $avatar_data['item_id'],
+                        'item_id' => $item_id,
                         'html'    => false,
                         'type'    => 'full',
@@ -1449 +1455 @@
             ),
             'feedback_code' => 2,
-            'item_id'       => $avatar_data['item_id'],
+            'item_id'       => $item_id,
         );
 
         if ( 'user' === $avatar_data['object'] ) {
             /** This action is documented in wp-includes/deprecated.php */
-            do_action_deprecated( 'xprofile_avatar_uploaded', array( (int) $avatar_data['item_id'], $avatar_data['type'], $r ), '6.0.0', 'bp_members_avatar_uploaded' );
+            do_action_deprecated( 'xprofile_avatar_uploaded', array( $item_id, $avatar_data['type'], $r ), '6.0.0', 'bp_members_avatar_uploaded' );
 
             /** This action is documented in bp-core/bp-core-avatars.php */
-            do_action( 'bp_members_avatar_uploaded', (int) $avatar_data['item_id'], $avatar_data['type'], $r, $cropped_avatar );
+            do_action( 'bp_members_avatar_uploaded', $item_id, $avatar_data['type'], $r, $cropped_avatar );
         } elseif ( 'group' === $avatar_data['object'] ) {
             /** This action is documented in bp-groups/bp-groups-screens.php */
-            do_action( 'groups_avatar_uploaded', (int) $avatar_data['item_id'], $avatar_data['type'], $r, $cropped_avatar );
+            do_action( 'groups_avatar_uploaded', $item_id, $avatar_data['type'], $r, $cropped_avatar );
         }