Ticket #3429: 3429.03.patch

bp-activity/bp-activity-functions.php

@@ -923 +923 @@
         if ( isset( $activity_obj->current_comment ) ) {
                 $activity_obj = $activity_obj->current_comment;
         }
-        
+
         if ( 'new_blog_post' == $activity_obj->type || 'new_blog_comment' == $activity_obj->type || 'new_forum_topic' == $activity_obj->type || 'new_forum_post' == $activity_obj->type )
                 $link = $activity_obj->primary_link;
         else {
@@ -994 +994 @@
 /** Embeds *******************************************************************/
 
 /**
- * Grabs the activity ID and attempts to retrieve the oEmbed cache (if it exists)
+ * Grabs the activity update ID and attempts to retrieve the oEmbed cache (if it exists)
  * during the activity loop.  If no cache and link is embeddable, cache it.
  *
+ * This does not cover recursive activity comments, as they do not use a real loop.
+ * For that, see {@link bp_activity_comment_embed()}.
+ *
  * @see BP_Embed
  * @see bp_embed_activity_cache()
  * @see bp_embed_activity_save_cache()
@@ -1011 +1014 @@
 add_action( 'activity_loop_start', 'bp_activity_embed' );
 
 /**
+ * Grabs the activity comment ID and attempts to retrieve the oEmbed cache (if it exists)
+ * when BP is recursing through activity comments {@link bp_activity_recurse_comments()}.
+ * If no cache and link is embeddable, cache it.
+ *
+ * @see BP_Embed
+ * @see bp_embed_activity_cache()
+ * @see bp_embed_activity_save_cache()
+ * @package BuddyPress Activity
+ * @since 1.5
+ */
+function bp_activity_comment_embed() {
+        add_filter( 'embed_post_id',         'bp_get_activity_comment_id' );
+        add_filter( 'bp_embed_get_cache',    'bp_embed_activity_cache',      10, 3 );
+        add_action( 'bp_embed_update_cache', 'bp_embed_activity_save_cache', 10, 3 );
+}
+add_action( 'bp_before_activity_comment', 'bp_activity_comment_embed' );
+
+/**
+ * Removes the 'embed_post_id' filter after {@link bp_activity_recurse_comments()}
+ * is rendered to avoid conflict with the 'embed_post_id' filter in
+ * {@link bp_activity_embed()} or any other component embeds.
+ *
+ * @see bp_activity_comment_embed()
+ * @package BuddyPress Activity
+ * @since 1.5
+ */
+function bp_activity_comment_embed_after_recurse() {
+        remove_filter( 'embed_post_id',      'bp_get_activity_comment_id' );
+}
+add_action( 'bp_after_activity_comment', 'bp_activity_comment_embed_after_recurse' );
+
+/**
  * Wrapper function for {@link bp_activity_get_meta()}.
  * Used during {@link BP_Embed::parse_oembed()} via {@link bp_activity_embed()}.
  *

bp-core/bp-core-classes.php

@@ -1168 +1168 @@
                 // Look for known internal handlers
                 ksort( $this->handlers );
                 foreach ( $this->handlers as $priority => $handlers ) {
-                        foreach ( $handlers as $id => $handler ) {
+                        foreach ( $handlers as $hid => $handler ) {
                                 if ( preg_match( $handler['regex'], $url, $matches ) && is_callable( $handler['callback'] ) ) {
                                         if ( false !== $return = call_user_func( $handler['callback'], $matches, $attr, $url, $rawattr ) )
                                                 return apply_filters( 'embed_handler_html', $return, $url, $attr );
@@ -1177 +1177 @@
                 }
 
                 // Get object ID
+                $id = '';
                 $id = apply_filters( 'embed_post_id', $id );
 
                 // Is oEmbed discovery on?
@@ -1219 +1220 @@
          * @return string The embed HTML on success, otherwise the original URL.
          */
         function parse_oembed( $id, $url, $attr, $rawattr ) {
-                if ( $id ) {
+                if ( is_numeric( $id ) ) {
                         // Setup the cachekey
                         $cachekey = '_oembed_' . md5( $url . serialize( $attr ) );
 
@@ -1229 +1230 @@
 
                         // Grab cache and return it if available
                         if ( !empty( $cache ) ) {
-                                return apply_filters( 'embed_oembed_html', $cache, $url, $attr, $rawattr );
+                                return apply_filters( 'bp_embed_oembed_html', $cache, $url, $attr, $rawattr );
 
                         // If no cache, ping the oEmbed provider and cache the result
                         } else {

bp-themes/bp-default/_inc/ajax.php

@@ -339 +339 @@
         if ( !$activity )
                 exit(); // todo: error?
 
+        do_action( 'bp_activity_action_get_single_activity_content', $_POST['activity_id'] );
+
         // Activity content retrieved through AJAX should run through normal filters, but not be
         // truncated
         remove_filter( 'bp_get_activity_content_body', 'bp_activity_truncate_entry', 5 );

bp-themes/bp-default/functions.php

@@ -134 +134 @@
  * @since 1.5
  */
 function bp_dtheme_enqueue_scripts() {
-        
+
         // Bump this when changes are made to bust cache
         $version = '20110729';
-        
+
         // Enqueue the global JS - Ajax will not work without it
         wp_enqueue_script( 'dtheme-ajax-js', get_template_directory_uri() . '/_inc/global.js', array( 'jquery' ), $version );
 
@@ -169 +169 @@
 
         // Bump this when changes are made to bust cache
         $version = '20110731b';
-        
+
         // Default CSS
         wp_enqueue_style( 'bp-default-main', get_template_directory_uri() . '/_inc/css/default.css', array(), $version );
 
@@ -702 +702 @@
                 </div><!-- #<?php echo $nav_id; ?> -->
         <?php endif;
 }
+
+if ( !function_exists( 'bp_dtheme_embed_expanded_activity' ) ) :
+/**
+ * When a user clicks on a "Read More" item, make sure embeds are correctly parsed and shown
+ * for the expanded content.
+ *
+ * @param int $activity_id The activity ID that is being expanded
+ * @since 1.5
+ * @see BP_Embed
+ */
+function bp_dtheme_embed_expanded_activity( $activity_id ) {
+        add_filter( 'embed_post_id',            create_function( '', 'return $activity_id;' ) );
+        add_filter( 'bp_embed_get_cache',       'bp_embed_activity_cache',      10, 3 );
+        add_action( 'bp_embed_update_cache',    'bp_embed_activity_save_cache', 10, 3 );
+}
+add_action( 'bp_activity_action_get_single_activity_content', 'bp_dtheme_embed_expanded_activity' );
+endif;
+
 ?>