Changeset 4506 for trunk/bp-activity/bp-activity-screens.php

Timestamp:

06/13/2011 09:54:52 PM (15 years ago)

Author:

boonebgorges

Message:

Introduces bp_do_404() for easy 404ing. Corrects invalid path handling throughout, using bp_do_404(). Fixes #3280. Props DJPaul

File:

• trunk/bp-activity/bp-activity-screens.php (modified) (2 diffs)

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

@@ -96 +96 @@
         $activity = bp_activity_get_specific( array( 'activity_ids' => bp_current_action() ) );
 
-        if ( !$activity = $activity['activities'][0] )
-                bp_core_redirect( bp_get_root_domain() );
+        // 404 if activity does not exist
+        if ( !$activity = $activity['activities'][0] ) {
+                bp_do_404();
+                return;
+        }
+
+        if ( !empty( $bp->action_variables ) ) {
+                bp_do_404();
+                return;
+        }
 
         // Default access is true
@@ -106 +114 @@
 
                 // Activity is from a group, but groups is currently disabled
-                if ( !bp_is_active( 'groups') )
-                        bp_core_redirect( bp_get_root_domain() );
+                if ( !bp_is_active( 'groups') ) {
+                        bp_do_404();
+                        return;
+                }
 
                 // Check to see if the group is not public, if so, check the