Changeset 6285 for trunk/bp-core/bp-core-catchuri.php

Timestamp:

09/03/2012 12:33:13 AM (14 years ago)

Author:

johnjamesjacoby

Message:

Theme Compatibility:

• First pass at including theme compatibility into BuddyPress.
• Introduce dependency, theme-compatibility, template-loader files into Core component.
• Add theme compatibility classes for components with direct template access.
• Move actions and filters around for improved plugin dependency.
• Remove old $bbp references.
• Turn $bp global into byref singleton, and include methods for setting up theme compatibility. (Fixes #4470.)
• Add is_buddypress() function to bp-core-template.php.
• Rename incorrectly named bp_after_theme_setup sub-action.
• See: #3741.

File:

• trunk/bp-core/bp-core-catchuri.php (modified) (2 diffs)

trunk/bp-core/bp-core-catchuri.php

@@ -370 +370 @@
     }
 
-    // Define local variables
-    $located_template   = false;
+    // Fetch each template and add the php suffix
     $filtered_templates = array();
-
-    // Fetch each template and add the php suffix
-    foreach ( (array) $templates as $template )
+    foreach ( (array) $templates as $template ) {
         $filtered_templates[] = $template . '.php';
+    }
 
     // Filter the template locations so that plugins can alter where they are located
@@ -392 +390 @@
 
         do_action( 'bp_core_post_load_template', $located_template );
-    }
-
-    // Kill any other output after this.
-    die;
+
+        // Kill any other output after this.
+        exit();
+
+    // No template found, so setup theme compatability
+    // @todo Some other 404 handling if theme compat doesn't kick in
+    } else {
+        do_action( 'bp_setup_theme_compat' );
+    }
 }