Changeset 6988

Timestamp:

05/01/2013 08:12:37 PM (13 years ago)

Author:

boonebgorges

Message:

Only call BP_Group_Extension::create_screen* methods on proper creation step

By moving the bp_is_group_admin_screen() check into BP_Group_Extension, we
leave one fewer thing for plugins to miss in their implementations.

Load order issues mean that the calls to create_screen() and
create_screen_save() must be moved into standalone callbacks, and hooked
late in the load order so that we have access to information about the current
group creation step.

See #4955

File:

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

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

@@ -1467 +1467 @@
                         );
 
-                        // Attach the group creation step display content action
-                        add_action( 'groups_custom_create_steps', array( &$this, 'create_screen' ) );
-
-                        // Attach the group creation step save content action
-                        add_action( 'groups_create_group_step_save_' . $this->create_slug, array( &$this, 'create_screen_save' ) );
+                        // The maybe_ methods check to see whether the create_*
+                        // callbacks should be invoked (ie, are we on the
+                        // correct group creation step). Hooked in separate
+                        // methods because current creation step info not yet
+                        // available at this point
+                        add_action( 'groups_custom_create_steps', array( $this, 'maybe_create_screen' ) );
+                        add_action( 'groups_create_group_step_save_' . $this->create_slug, array( $this, 'maybe_create_screen_save' ) );
                 }
 
@@ -1568 +1570 @@
                 );
         }
+
+        /**
+         * Call the create_screen() method, if we're on the right page
+         *
+         * @since 1.8
+         */
+        public function maybe_create_screen() {
+                if ( bp_is_group_creation_step( $this->slug ) ) {
+                        $this->create_screen();
+                }
+        }
+
+        /**
+         * Call the create_screen_save() method, if we're on the right page
+         *
+         * @since 1.8
+         */
+        public function maybe_create_screen_save() {
+                if ( bp_is_group_creation_step( $this->slug ) ) {
+                        $this->create_screen_save();
+                }
+        }
+
 }