Changeset 11922

Timestamp:

04/01/2018 10:11:35 PM (7 years ago)

Author:

r-a-y

Message:

Groups: Move some functions from bp-groups-actions.php to bp-groups-functions.php

Some of the functions from bp-groups-actions.php are not related to group
page actions, so these are being moved to the all-purpose
bp-groups-functions.php file.

The intent is to remove and split up the bp-groups-actions.php and
bp-groups-screens.php files until these functions are actually
needed.

See #7218.

Location:

trunk/src/bp-groups

Files:

• bp-groups-actions.php (modified) (2 diffs)
• bp-groups-functions.php (modified) (1 diff)

trunk/src/bp-groups/bp-groups-actions.php

@@ -14 +14 @@
 // Exit if accessed directly.
 defined( 'ABSPATH' ) || exit;
-
-/**
- * Fire the 'bp_groups_register_group_types' action.
- *
- * @since 2.6.0
- */
-function bp_groups_register_group_types() {
-    /**
-     * Fires when it's appropriate to register group types.
-     *
-     * @since 2.6.0
-     */
-    do_action( 'bp_groups_register_group_types' );
-}
-add_action( 'bp_register_taxonomies', 'bp_groups_register_group_types' );
 
 /**
@@ -593 +578 @@
 }
 add_action( 'bp_actions', 'groups_action_group_feed' );
-
-/**
- * Update orphaned child groups when the parent is deleted.
- *
- * @since 2.7.0
- *
- * @param BP_Groups_Group $group Instance of the group item being deleted.
- */
-function bp_groups_update_orphaned_groups_on_group_delete( $group ) {
-    // Get child groups and set the parent to the deleted parent's parent.
-    $grandparent_group_id = $group->parent_id;
-    $child_args = array(
-        'parent_id'         => $group->id,
-        'show_hidden'       => true,
-        'per_page'          => false,
-        'update_meta_cache' => false,
-    );
-    $children = groups_get_groups( $child_args );
-    $children = $children['groups'];
-
-    foreach ( $children as $cgroup ) {
-        $cgroup->parent_id = $grandparent_group_id;
-        $cgroup->save();
-    }
-}
-add_action( 'bp_groups_delete_group', 'bp_groups_update_orphaned_groups_on_group_delete', 10, 2 );

trunk/src/bp-groups/bp-groups-functions.php

@@ -2200 +2200 @@
 add_action( 'bp_make_spam_user', 'groups_remove_data_for_user' );
 
+/**
+ * Update orphaned child groups when the parent is deleted.
+ *
+ * @since 2.7.0
+ *
+ * @param BP_Groups_Group $group Instance of the group item being deleted.
+ */
+function bp_groups_update_orphaned_groups_on_group_delete( $group ) {
+    // Get child groups and set the parent to the deleted parent's parent.
+    $grandparent_group_id = $group->parent_id;
+    $child_args = array(
+        'parent_id'         => $group->id,
+        'show_hidden'       => true,
+        'per_page'          => false,
+        'update_meta_cache' => false,
+    );
+    $children = groups_get_groups( $child_args );
+    $children = $children['groups'];
+
+    foreach ( $children as $cgroup ) {
+        $cgroup->parent_id = $grandparent_group_id;
+        $cgroup->save();
+    }
+}
+add_action( 'bp_groups_delete_group', 'bp_groups_update_orphaned_groups_on_group_delete', 10, 2 );
+
 /** Group Types ***************************************************************/
+
+/**
+ * Fire the 'bp_groups_register_group_types' action.
+ *
+ * @since 2.6.0
+ */
+function bp_groups_register_group_types() {
+    /**
+     * Fires when it's appropriate to register group types.
+     *
+     * @since 2.6.0
+     */
+    do_action( 'bp_groups_register_group_types' );
+}
+add_action( 'bp_register_taxonomies', 'bp_groups_register_group_types' );
 
 /**