Changeset 6605

Timestamp:

12/10/2012 01:39:30 PM (13 years ago)

Author:

johnjamesjacoby

Message:

When in theme-compat, make sure 'bp_head' gets added to 'wp_head' action. Also introduce bp_head() function, and use in bp-default header.php. Fixes #4669.

Location:

trunk

Files:

• bp-core/bp-core-dependency.php (modified) (1 diff)
• bp-core/bp-core-theme-compatibility.php (modified) (1 diff)
• bp-templates/bp-legacy/buddypress-functions.php (modified) (1 diff)
• bp-themes/bp-default/header.php (modified) (1 diff)

trunk/bp-core/bp-core-dependency.php

@@ -110 +110 @@
 }
 
+/**
+ * BuddyPress head scripts
+ */
+function bp_head() {
+    do_action ( 'bp_head' );
+}
+
 /** Theme Permissions *********************************************************/
 

trunk/bp-core/bp-core-theme-compatibility.php

@@ -476 +476 @@
 
         // Add a filter on the_content late, which we will later remove
-        add_filter( 'the_content', 'bp_replace_the_content' );
+        if ( ! has_filter( 'the_content', 'bp_replace_the_content' ) ) {
+            add_filter( 'the_content', 'bp_replace_the_content' );
+        }
+
+        // Add BuddyPress's head action to wp_head
+        if ( ! has_action( 'wp_head', 'bp_head' ) ) {
+            add_action( 'wp_head', 'bp_head' );
+        }
 
         // Find the appropriate template file

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

@@ -318 +318 @@
 
     // Set up the cookies passed on this AJAX request. Store a local var to avoid conflicts
-    if ( ! empty( $_POST['cookie'] ) )
+    if ( ! empty( $_POST['cookie'] ) ) {
         $_BP_COOKIE = wp_parse_args( str_replace( '; ', '&', urldecode( $_POST['cookie'] ) ) );
-    else
+    } else {
         $_BP_COOKIE = &$_COOKIE;
+    }
 
     $qs = array();

trunk/bp-themes/bp-default/header.php

@@ -8 +8 @@
         <link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>" />
 
-        <?php do_action( 'bp_head' ); ?>
+        <?php bp_head(); ?>
         <?php wp_head(); ?>