Changeset 9901 for trunk/src/bp-groups/classes/class-bp-groups-member.php

Timestamp:

05/31/2015 05:37:08 AM (9 years ago)

Author:

johnjamesjacoby

Message:

Groups: Updates to delete_invite() method:

• Add brackets around if condition
• Break query apart into separate lines for better readability
• Add inviter_id != 0 condition to query (note that this means not using $wpdb->delete())

Fixes a regression (from r9810) causing group membership invitations to be irreversible if the form was not submitted first.

Fixes #6462. Props dcavins, imath.

File:

• trunk/src/bp-groups/classes/class-bp-groups-member.php (modified) (2 diffs)

trunk/src/bp-groups/classes/class-bp-groups-member.php

@@ -722 +722 @@
      * Delete an invitation, by specifying user ID and group ID.
      *
-     * @param int $user_id ID of the user.
-     * @param int $group_id ID of the group.
+     * @global WPDB $wpdb
+     *
+     * @param  int $user_id  ID of the user.
+     * @param  int $group_id ID of the group.
      * @return int Number of records deleted.
      */
@@ -729 +731 @@
         global $wpdb;
 
-        if ( empty( $user_id ) )
-            return false;
-
-        $bp = buddypress();
-
-        return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id = %d AND is_confirmed = 0 AND inviter_id != 0 AND invite_sent = 1", $user_id, $group_id ) );
+        if ( empty( $user_id ) ) {
+            return false;
+        }
+
+        $table_name = buddypress()->groups->table_name_members;
+
+        $sql = "DELETE FROM {$table_name}
+                WHERE user_id = %d
+                    AND group_id = %d
+                    AND is_confirmed = 0
+                    AND inviter_id != 0";
+
+        $prepared = $wpdb->prepare( $sql, $user_id, $group_id );
+
+        return $wpdb->query( $prepared );
     }