Changeset 3922 for branches/plugin/bbp-includes/bbp-template-loader.php

Timestamp:

05/30/2012 06:28:31 AM (14 years ago)

Author:

johnjamesjacoby

Message:

Template Loader:

• Add missing single and archive functions.
• Add checks for these templates to loader filter.

File:

• branches/plugin/bbp-includes/bbp-template-loader.php (modified) (6 diffs)

branches/plugin/bbp-includes/bbp-template-loader.php

@@ -46 +46 @@
 function bbp_template_include_theme_supports( $template = '' ) {
 
-    // Bail if current theme does not support bbPress
-    if ( !current_theme_supports( 'bbpress' ) )
-        return $template;
-
     // Viewing a user
     if     ( bbp_is_single_user()      && ( $new_template = bbp_get_single_user_template()      ) ) :
@@ -59 +55 @@
     elseif ( bbp_is_single_view()      && ( $new_template = bbp_get_single_view_template()      ) ) :
 
-    // Topic edit
+    // Single Forum
+    elseif ( bbp_is_single_forum()     && ( $new_template = bbp_get_single_forum_template()     ) ) :
+
+    // Forum Archive
+    elseif ( bbp_is_forum_archive()    && ( $new_template = bbp_get_forum_archive_template()    ) ) :
+
+    // Forum edit
     elseif ( bbp_is_forum_edit()       && ( $new_template = bbp_get_forum_edit_template()       ) ) :
+
+    // Single Topic
+    elseif ( bbp_is_single_topic()     && ( $new_template = bbp_get_single_topic_template()     ) ) :
+
+    // Topic Archive
+    elseif ( bbp_is_topic_archive()    && ( $new_template = bbp_get_topic_archive_template()    ) ) :
 
     // Topic merge
@@ -70 +78 @@
     // Topic edit
     elseif ( bbp_is_topic_edit()       && ( $new_template = bbp_get_topic_edit_template()       ) ) :
+
+    // Single Reply
+    elseif ( bbp_is_single_reply()     && ( $new_template = bbp_get_single_reply_template()     ) ) :
 
     // Editing a reply
@@ -172 +183 @@
 
 /**
+ * Get the single forum template
+ *
+ * @since bbPress (r3922)
+ *
+ * @uses bbp_get_forum_post_type()
+ * @uses bbp_get_query_template()
+ * @return string Path to template file
+ */
+function bbp_get_single_forum_template() {
+    $templates = array(
+        'single-' . bbp_get_forum_post_type() . '.php' // Single Forum
+    );
+    return bbp_get_query_template( 'single_forum', $templates );
+}
+
+/**
+ * Get the forum archive template
+ *
+ * @since bbPress (r3922)
+ *
+ * @uses bbp_get_forum_post_type()
+ * @uses bbp_get_query_template()
+ * @return string Path to template file
+ */
+function bbp_get_forum_archive_template() {
+    $templates = array(
+        'archive-' . bbp_get_forum_post_type() . '.php' // Forum Archive
+    );
+    return bbp_get_query_template( 'forum_archive', $templates );
+}
+
+/**
  * Get the forum edit template
  *
@@ -190 +233 @@
 
 /**
+ * Get the single topic template
+ *
+ * @since bbPress (r3922)
+ *
+ * @uses bbp_get_topic_post_type()
+ * @uses bbp_get_query_template()
+ * @return string Path to template file
+ */
+function bbp_get_single_topic_template() {
+    $templates = array(
+        'single-' . bbp_get_topic_post_type() . '.php'
+    );
+    return bbp_get_query_template( 'single_topic', $templates );
+}
+
+/**
+ * Get the topic archive template
+ *
+ * @since bbPress (r3922)
+ *
+ * @uses bbp_get_topic_post_type()
+ * @uses bbp_get_query_template()
+ * @return string Path to template file
+ */
+function bbp_get_topic_archive_template() {
+    $templates = array(
+        'archive-' . bbp_get_topic_post_type() . '.php' // Topic Archive
+    );
+    return bbp_get_query_template( 'topic_archive', $templates );
+}
+
+/**
  * Get the topic edit template
  *
@@ -239 +314 @@
     );
     return bbp_get_query_template( 'topic_merge', $templates );
+}
+
+/**
+ * Get the single reply template
+ *
+ * @since bbPress (r3922)
+ *
+ * @uses bbp_get_reply_post_type()
+ * @uses bbp_get_query_template()
+ * @return string Path to template file
+ */
+function bbp_get_single_reply_template() {
+    $templates = array(
+        'single-' . bbp_get_reply_post_type() . '.php'
+    );
+    return bbp_get_query_template( 'single_reply', $templates );
 }