Ticket #5999: 5999.patch

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

@@ -1196 +1196 @@
 
         return apply_filters( 'bp_core_avatar_thumb', $avatar );
 }
+
+/**
+ * Is the user changing an avatar (profile or group) ?
+ *
+ * @since  BuddyPress (2.2.0)
+ *
+ * @uses   bp_is_group_create()
+ * @uses   bp_is_group_admin_page()
+ * @uses   bp_is_group_admin_screen() to check for a group admin screen
+ * @uses   bp_action_variable() to check for the group's avatar creation step
+ * @uses   bp_is_user_change_avatar() to check for the user's change profile screen
+ * @return bool true if on a "change avatar" screen, false otherwise
+ */
+function bp_core_avatar_is_crop_step() {
+        $retval = false;
+
+        /**
+         * Use core template functions checks before specific to the groups component ones.
+         */
+        if ( bp_is_group_admin_page() ) {
+                $retval = (bool) bp_is_group_admin_screen( 'group-avatar' );
+        } else if ( bp_is_group_create() ) {
+                // we can't use bp_get_groups_current_create_step() as it's not set yet
+                $retval = (bool) 'group-avatar' == bp_action_variable( 1 );
+        } else {
+                $retval = bp_is_user_change_avatar();
+        }
+
+        return $retval;
+}
+
+/**
+ * Reset the week argument of the main query if needed
+ *
+ * When cropping an avatar, a $_POST['w'] var is sent, setting
+ * the 'week' paramater of WordPress main query to this posted var.
+ * To avoid notices we need to make sure this query var is reset to 0
+ *
+ * @since  BuddyPress (2.2.0)
+ *
+ * @param  WP_Quert $posts_query the main query object
+ */
+function bp_core_avatar_reset_query( $posts_query = null ) {
+        if ( bp_core_avatar_is_crop_step() && isset( $_POST['avatar-crop-submit'] ) ) {
+                $posts_query->set( 'w', 0 );
+        }
+}
+add_action( 'bp_parse_query', 'bp_core_avatar_reset_query', 10, 1 );