Changeset 4326

Timestamp:

11/03/2012 10:44:26 PM (12 years ago)

Author:

johnjamesjacoby

Message:

Theme Compat:

• Reverse the look-up of bbp_locate_template() and check $template_names first.
• When a template is located, break out of both loops.
• See #1968.

File:

• trunk/includes/core/template-functions.php (modified) (1 diff)

trunk/includes/core/template-functions.php

@@ -64 +64 @@
     $located = false;
 
-    // Loop through template stack
-    foreach ( (array) bbp_get_template_stack() as $template_location ) {
-
-        // Continue if $template_location is empty
-        if ( empty( $template_location ) )
+    // Try to find a template file
+    foreach ( (array) $template_names as $template_name ) {
+
+        // Continue if template is empty
+        if ( empty( $template_name ) )
             continue;
 
-        // Try to find a template file
-        foreach ( (array) $template_names as $template_name ) {
-
-            // Continue if template is empty
-            if ( empty( $template_name ) )
+        // Trim off any slashes from the template name
+        $template_name  = ltrim( $template_name, '/' );
+
+        // Loop through template stack
+        foreach ( (array) bbp_get_template_stack() as $template_location ) {
+
+            // Continue if $template_location is empty
+            if ( empty( $template_location ) )
                 continue;
-
-            // Trim off any slashes from the template name
-            $template_name  = ltrim( $template_name, '/' );
 
             // Check child theme first
             if ( file_exists( trailingslashit( $template_location ) . $template_name ) ) {
                 $located = trailingslashit( $template_location ) . $template_name;
-                break;
+                break 2;
             }
         }