Skip to:
Content

bbPress.org

Changeset 4326


Ignore:
Timestamp:
11/03/2012 10:44:26 PM (9 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/includes/core/template-functions.php

    r4324 r4326  
    6464    $located = false;
    6565
    66     // Loop through template stack
    67     foreach ( (array) bbp_get_template_stack() as $template_location ) {
    68 
    69         // Continue if $template_location is empty
    70         if ( empty( $template_location ) )
     66    // Try to find a template file
     67    foreach ( (array) $template_names as $template_name ) {
     68
     69        // Continue if template is empty
     70        if ( empty( $template_name ) )
    7171            continue;
    7272
    73         // Try to find a template file
    74         foreach ( (array) $template_names as $template_name ) {
    75 
    76             // Continue if template is empty
    77             if ( empty( $template_name ) )
     73        // Trim off any slashes from the template name
     74        $template_name  = ltrim( $template_name, '/' );
     75
     76        // Loop through template stack
     77        foreach ( (array) bbp_get_template_stack() as $template_location ) {
     78
     79            // Continue if $template_location is empty
     80            if ( empty( $template_location ) )
    7881                continue;
    79 
    80             // Trim off any slashes from the template name
    81             $template_name  = ltrim( $template_name, '/' );
    8282
    8383            // Check child theme first
    8484            if ( file_exists( trailingslashit( $template_location ) . $template_name ) ) {
    8585                $located = trailingslashit( $template_location ) . $template_name;
    86                 break;
     86                break 2;
    8787            }
    8888        }
Note: See TracChangeset for help on using the changeset viewer.