Changeset 14053

Timestamp:

10/22/2024 08:56:00 PM (19 months ago)

Author:

imath

Message:

12.5.2 version bumps (branch 12.0)

Location:

branches/12.0

Files:

• bp-loader.php (modified) (1 diff)
• npm-shrinkwrap.json (modified) (2 diffs)
• package.json (modified) (1 diff)
• src/bp-core/bp-core-avatars.php (modified) (9 diffs)
• src/bp-loader.php (modified) (1 diff)
• src/class-buddypress.php (modified) (1 diff)

branches/12.0/bp-loader.php

@@ -22 +22 @@
  * Requires PHP:      5.6
  * Requires at least: 5.8
- * Version:           12.5.1
+ * Version:           12.5.2
  */
 

branches/12.0/npm-shrinkwrap.json

@@ -1 +1 @@
 {
     "name": "buddypress",
-    "version": "12.5.1",
+    "version": "12.5.2",
     "lockfileVersion": 2,
     "requires": true,
@@ -7 +7 @@
         "": {
             "name": "buddypress",
-            "version": "12.5.1",
+            "version": "12.5.2",
             "license": "GPL-2.0-or-later",
             "devDependencies": {

branches/12.0/package.json

@@ -76 +76 @@
         "url": "https://buddypress.svn.wordpress.org/trunk/"
     },
-    "version": "12.5.1",
+    "version": "12.5.2",
     "browserslist": [
         "extends @wordpress/browserslist-config"

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

@@ -1188 +1188 @@
  */
 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;
@@ -1355 +1358 @@
     }
 
+    // Sanitize object id.
+    $item_id = (int) $avatar_data['item_id'];
+
     // Capability check.
     if ( ! bp_attachments_current_user_can( 'edit_avatar', $avatar_data ) ) {
@@ -1368 +1374 @@
         }
 
-        $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 ) {
@@ -1381 +1387 @@
                         array(
                             'object'  => $avatar_data['object'],
-                            'item_id' => $avatar_data['item_id'],
+                            'item_id' => $item_id,
                             'html'    => false,
                             'type'    => 'full',
@@ -1388 +1394 @@
                 ),
                 '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' );
 
             /**
@@ -1405 +1411 @@
              * @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 );
@@ -1426 +1432 @@
     // Crop args.
     $r = array(
-        'item_id'       => $avatar_data['item_id'],
+        'item_id'       => $item_id,
         'object'        => $avatar_data['object'],
         'avatar_dir'    => $avatar_dir,
@@ -1445 +1451 @@
                     array(
                         'object'  => $avatar_data['object'],
-                        'item_id' => $avatar_data['item_id'],
+                        'item_id' => $item_id,
                         'html'    => false,
                         'type'    => 'full',
@@ -1452 +1458 @@
             ),
             '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 );
         }
 

branches/12.0/src/bp-loader.php

@@ -22 +22 @@
  * Requires PHP:      5.6
  * Requires at least: 5.8
- * Version:           12.5.1
+ * Version:           12.5.2
  */
 

branches/12.0/src/class-buddypress.php

@@ -461 +461 @@
         /** Versions */
 
-        $this->version    = '12.5.1';
+        $this->version    = '12.5.2';
         $this->db_version = 13422;