Ticket #6065: 6065.03.patch

src/bp-core/bp-core-filters.php

@@ -65 +65 @@
 // Filter BuddyPress template locations
 add_filter( 'bp_get_template_stack', 'bp_add_template_stack_locations' );
 
-// Filter BuddyPress template hierarchy and look for page templates
-add_filter( 'bp_get_buddypress_template', 'bp_theme_compat_page_templates' );
-
 // Turn comments off for BuddyPress pages
 add_filter( 'comments_open', 'bp_comments_open', 10, 2 );
 

src/bp-core/bp-core-template-loader.php

@@ -462 +462 @@
                 'index.php'
         ) );
 }
-
-/**
- * Filter the default theme compatibility root template hierarchy, and prepend
- * a page template to the front if it's set.
- *
- * @see https://buddypress.trac.wordpress.org/ticket/6065
- *
- * @since BuddyPress (2.2.0)
- *
- * @param  array $templates
- * @return array
- */
-function bp_theme_compat_page_templates( $templates = array() ) {
-
-        // Bail if not looking at a directory
-        if ( ! bp_is_directory() ) {
-                return $templates;
-        }
-
-        // No page ID yet
-        $page_id = 0;
-
-        // Get the WordPress Page ID for the current view.
-        foreach ( (array) buddypress()->pages as $component => $bp_page ) {
-
-                // Handles the majority of components.
-                if ( bp_is_current_component( $component ) ) {
-                        $page_id = (int) $bp_page->id;
-                }
-
-                // Stop if not on a user page.
-                if ( ! bp_is_user() && ! empty( $page_id ) ) {
-                        break;
-                }
-
-                // The Members component requires an explicit check due to overlapping components.
-                if ( bp_is_user() && ( 'members' === $component ) ) {
-                        $page_id = (int) $bp_page->id;
-                        break;
-                }
-        }
-
-        // Bail if no directory page set
-        if ( 0 === $page_id ) {
-                return $templates;
-        }
-
-        // Check for page template
-        $page_template = get_page_template_slug( $page_id );
-
-        // Add it to the beginning of the templates array so it takes precedence
-        // over the default hierarchy.
-        if ( ! empty( $page_template ) ) {
-                array_unshift( $templates, $page_template );
-        }
-
-        return $templates;
-}

src/bp-templates/bp-legacy/buddypress-functions.php

@@ -80 +80 @@
                 // Template Output
                 add_filter( 'bp_get_activity_action_pre_meta', array( $this, 'secondary_avatars' ), 10, 2 );
 
+                // Filter BuddyPress template hierarchy and look for page templates
+                add_filter( 'bp_get_buddypress_template', array( $this, 'theme_compat_page_templates' ), 10, 1 );
+
                 /** Scripts ***********************************************************/
 
                 add_action( 'bp_enqueue_scripts', array( $this, 'enqueue_styles'   ) ); // Enqueue theme CSS
@@ -440 +443 @@
 
                 return $action;
         }
+
+        /**
+         * Filter the default theme compatibility root template hierarchy, and prepend
+         * a page template to the front if it's set.
+         *
+         * @see https://buddypress.trac.wordpress.org/ticket/6065
+         *
+         * @since BuddyPress (2.2.0)
+         *
+         * @param  array $templates
+         * @uses   apply_filters() call 'bp_legacy_theme_compat_page_templates_directory_only' and return false to it
+         *                              to use the defined page template for component's directory and its single items
+         * @return array
+         */
+        public function theme_compat_page_templates( $templates = array() ) {
+                // Bail if not looking at a directory
+                if ( true === (bool) apply_filters( 'bp_legacy_theme_compat_page_templates_directory_only', ! bp_is_directory() ) ) {
+                        return $templates;
+                }
+
+                // No page ID yet
+                $page_id = 0;
+
+                // Get the WordPress Page ID for the current view.
+                foreach ( (array) buddypress()->pages as $component => $bp_page ) {
+
+                        // Handles the majority of components.
+                        if ( bp_is_current_component( $component ) ) {
+                                $page_id = (int) $bp_page->id;
+                        }
+
+                        // Stop if not on a user page.
+                        if ( ! bp_is_user() && ! empty( $page_id ) ) {
+                                break;
+                        }
+
+                        // The Members component requires an explicit check due to overlapping components.
+                        if ( bp_is_user() && ( 'members' === $component ) ) {
+                                $page_id = (int) $bp_page->id;
+                                break;
+                        }
+                }
+
+                // Bail if no directory page set
+                if ( 0 === $page_id ) {
+                        return $templates;
+                }
+
+                // Check for page template
+                $page_template = get_page_template_slug( $page_id );
+
+                // Add it to the beginning of the templates array so it takes precedence
+                // over the default hierarchy.
+                if ( ! empty( $page_template ) ) {
+                        array_unshift( $templates, $page_template );
+                }
+
+                return $templates;
+        }
 }
 new BP_Legacy();
 endif;