Changeset 3765

Timestamp:

01/20/2011 12:04:01 PM (15 years ago)

Author:

johnjamesjacoby

Message:

Move activity screen index function to correct location

Location:

trunk/bp-activity

Files:

• bp-activity-functions.php (modified) (1 diff)
• bp-activity-screens.php (modified) (1 diff)

trunk/bp-activity/bp-activity-functions.php

@@ -9 +9 @@
  * @subpackage Activity Core
  */
-
-/**
- * @todo Figure out if this is still needed
- *
- * @global obj $bp
- */
-function bp_activity_directory_activity_setup() {
-    global $bp;
-
-    if ( bp_is_activity_component() && empty( $bp->current_action ) ) {
-        $bp->is_directory = true;
-
-        do_action( 'bp_activity_directory_activity_setup' );
-
-        bp_core_load_template( apply_filters( 'bp_activity_directory_activity_setup', 'activity/index' ) );
-    }
-}
-add_action( 'wp', 'bp_activity_directory_activity_setup', 2 );
 
 /**

trunk/bp-activity/bp-activity-screens.php

@@ -8 +8 @@
  * business functions, then pass on the user to a template file.
  */
+
+/**
+ * Activity index
+ *
+ * @global obj $bp
+ */
+function bp_activity_screen_index() {
+    global $bp;
+
+    if ( bp_is_activity_component() && empty( $bp->current_action ) ) {
+        $bp->is_directory = true;
+
+        do_action( 'bp_activity_screen_index' );
+
+        bp_core_load_template( apply_filters( 'bp_activity_screen_index', 'activity/index' ) );
+    }
+}
+add_action( 'wp', 'bp_activity_screen_index', 2 );
 
 function bp_activity_screen_my_activity() {