Changeset 6439

Timestamp:

10/22/2012 07:08:52 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Theme Compat:

• Move 'bp_add_template_locations' filter from 'bp_get_template_part' to 'bp_locate_template'
• Allows for easier template location across multiple theme configurations.
• Revert part of r6394 in lieu of this method.
• See #3741

Location:

trunk/bp-core

Files:

• bp-core-filters.php (modified) (6 diffs)
• bp-core-template-loader.php (modified) (3 diffs)

trunk/bp-core/bp-core-filters.php

@@ -63 +63 @@
 
 // Run all template parts through additional template locations
-add_filter( 'bp_get_template_part', 'bp_add_template_locations' );
+add_filter( 'bp_locate_template', 'bp_add_template_locations' );
 
 // Turn comments off for BuddyPress pages
@@ -239 +239 @@
     return str_replace( 'PASSWORD', __( '[User Set]', 'buddypress' ), $welcome_email );
 }
-if ( !is_admin() && empty( $_GET['e'] ) )
-    add_filter( 'update_welcome_user_email', 'bp_core_filter_user_welcome_email' );
+add_filter( 'update_welcome_user_email', 'bp_core_filter_user_welcome_email' );
 
 /***
@@ -264 +263 @@
     return str_replace( $password, __( '[User Set]', 'buddypress' ), $welcome_email );
 }
-if ( !is_admin() && empty( $_GET['e'] ) )
-    add_filter( 'update_welcome_email', 'bp_core_filter_blog_welcome_email', 10, 4 );
+add_filter( 'update_welcome_email', 'bp_core_filter_blog_welcome_email', 10, 4 );
 
 // Notify user of signup success.
@@ -296 +294 @@
     return false;
 }
-if ( !is_admin() )
-    add_filter( 'wpmu_signup_blog_notification', 'bp_core_activation_signup_blog_notification', 1, 7 );
+add_filter( 'wpmu_signup_blog_notification', 'bp_core_activation_signup_blog_notification', 1, 7 );
 
 function bp_core_activation_signup_user_notification( $user, $user_email, $key, $meta ) {
@@ -308 +305 @@
         $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
 
-    // If this is an admin generated activation, add a param to email the
-    // user login details
-    $email = is_admin() ? '&e=1' : '';
-
     $from_name       = ( '' == get_site_option( 'site_name' ) ) ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
     $message_headers = "MIME-Version: 1.0\n" . "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option( 'blog_charset' ) . "\"\n";
-    $message         = sprintf( __( "Thanks for registering! To complete the activation of your account please click the following link:\n\n%1\$s\n\n", 'buddypress' ), $activate_url . $email );
+    $message         = sprintf( __( "Thanks for registering! To complete the activation of your account please click the following link:\n\n%1\$s\n\n", 'buddypress' ), $activate_url );
     $subject         = '[' . $from_name . '] ' . __( 'Activate Your Account', 'buddypress' );
 
@@ -329 +322 @@
     return false;
 }
-if ( !is_admin() || ( is_admin() && empty( $_POST['noconfirmation'] ) ) )
-    add_filter( 'wpmu_signup_user_notification', 'bp_core_activation_signup_user_notification', 1, 4 );
+add_filter( 'wpmu_signup_user_notification', 'bp_core_activation_signup_user_notification', 1, 4 );
 
 /**

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

@@ -67 +67 @@
     $fallback_theme = bp_get_theme_compat_dir();
 
+    // Allow templates to be filtered
+    // BuddyPress core automatically adds bp_add_template_locations()
+    $template_names = apply_filters( 'bp_locate_template', $template_names );
+
     // Try to find a template file
     foreach ( (array) $template_names as $template_name ) {
@@ -88 +92 @@
 
         // Check theme compatibility last
-        } else {
-            // 3rd-party plugin devs can hook into the 'bp_locate_fallback_template'
-            // filter to load custom templates for their component if desired
-            $fallback_template = apply_filters( 'bp_locate_fallback_template', trailingslashit( $fallback_theme ) . $template_name, $template_name );
-
-            if ( file_exists( $fallback_template ) ) {
-                $located = $fallback_template;
-                break;
-            }
+        } elseif ( file_exists( trailingslashit( $fallback_theme ) . $template_name ) ) {
+            $located = trailingslashit( $fallback_theme ) . $template_name;
+            break;
         }
     }
@@ -204 +202 @@
 
     // Loop through locations and templates and combine
-    foreach ( $locations as $location )
-        foreach ( $templates as $template )
-            $retval[] = trailingslashit( $location ) . $template;
+    foreach ( (array) $locations as $location )
+        foreach ( (array) $templates as $template )
+            $retval[] = ltrim( trailingslashit( $location ) . $template, '/' );
 
     return apply_filters( 'bp_add_template_locations', $retval, $templates );