Changeset 6992 for trunk/bp-groups/bp-groups-classes.php

Timestamp:

05/03/2013 01:54:38 AM (12 years ago)

Author:

boonebgorges

Message:

Pass the group id to the edit_ and create_ methods of BP_Group_Extension

This change creates parity with the admin_screen() and admin_screen_save()
methods, which will make it easier for plugin authors to abstract shared logic.

See #4955

File:

• trunk/bp-groups/bp-groups-classes.php (modified) (6 diffs)

trunk/bp-groups/bp-groups-classes.php

@@ -1428 +1428 @@
     function widget_display() {}
 
-    function edit_screen() {}
-
-    function edit_screen_save() {}
-
-    function create_screen() {}
-
-    function create_screen_save() {}
+    function edit_screen( $group_id = null ) {}
+
+    function edit_screen_save( $group_id = null ) {}
+
+    function create_screen( $group_id = null ) {}
+
+    function create_screen_save( $group_id = null ) {}
 
     // Private Methods
@@ -1516 +1516 @@
             // Catch the edit screen and forward it to the plugin template
             if ( bp_is_groups_component() && bp_is_current_action( 'admin' ) && bp_is_action_variable( $this->admin_slug, 0 ) ) {
-                // Check whether the user is saving changes
-                $this->edit_screen_save();
-
-                add_action( 'groups_custom_edit_steps', array( &$this, 'edit_screen' ) );
+                $this->edit_screen_save( bp_get_current_group_id() );
+
+                add_action( 'groups_custom_edit_steps', array( &$this, 'call_edit_screen' ) );
 
                 if ( '' != bp_locate_template( array( 'groups/single/home.php' ), false ) ) {
@@ -1525 +1524 @@
                 } else {
                     add_action( 'bp_template_content_header', create_function( '', 'echo "<ul class=\"content-header-nav\">"; bp_group_admin_tabs(); echo "</ul>";' ) );
-                    add_action( 'bp_template_content', array( &$this, 'edit_screen' ) );
+                    add_action( 'bp_template_content', array( &$this, 'call_edit_screen' ) );
                     bp_core_load_template( apply_filters( 'bp_core_template_plugin', '/groups/single/plugins' ) );
                 }
@@ -1572 +1571 @@
 
     /**
+     * Call the edit_screen() method
+     *
+     * Broken into a standalone method so we can pass the current group id
+     * to edit_screen()
+     *
+     * @since 1.8
+     */
+    public function call_edit_screen() {
+        $this->edit_screen( bp_get_current_group_id() );
+    }
+
+    /**
      * Call the create_screen() method, if we're on the right page
      *
@@ -1578 +1589 @@
     public function maybe_create_screen() {
         if ( bp_is_group_creation_step( $this->slug ) ) {
-            $this->create_screen();
+            $this->create_screen( bp_get_new_group_id() );
         }
     }
@@ -1589 +1600 @@
     public function maybe_create_screen_save() {
         if ( bp_is_group_creation_step( $this->slug ) ) {
-            $this->create_screen_save();
+            $this->create_screen_save( bp_get_new_group_id() );
         }
     }