Changeset 4937

Timestamp:

08/06/2011 04:24:46 PM (14 years ago)

Author:

djpaul

Message:

Tweak BP_Embed implementation; fix caching and PHP warning. Fixes #3429, props r-a-y

Location:

trunk

Files:

• bp-activity/bp-activity-functions.php (modified) (3 diffs)
• bp-core/bp-core-classes.php (modified) (4 diffs)
• bp-themes/bp-default/_inc/ajax.php (modified) (1 diff)

trunk/bp-activity/bp-activity-functions.php

@@ -924 +924 @@
         $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;
@@ -995 +995 @@
 
 /**
- * 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
@@ -1012 +1015 @@
 
 /**
+ * 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' );
+
+/**
+ * When a user clicks on a "Read More" item, make sure embeds are correctly parsed and shown for the expanded content.
+ *
+ * @global object $bp BuddyPress global settings
+ * @param BP_Activity_Activity $activity The activity that is being expanded
+ * @see BP_Embed
+ * @since 1.5
+ */
+function bp_dtheme_embed_read_more( $activity ) {
+    global $bp;
+
+    $bp->activity->read_more_id = $activity->id;
+
+    add_filter( 'embed_post_id',            create_function( '', 'global $bp; return $bp->activity->read_more_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_dtheme_get_single_activity_content', 'bp_dtheme_embed_read_more' );
+
+/**
+ * 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()}.

trunk/bp-core/bp-core-classes.php

@@ -1169 +1169 @@
         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 ) )
@@ -1178 +1178 @@
 
         // Get object ID
-        $id = apply_filters( 'embed_post_id', $id );
+        $id = apply_filters( 'embed_post_id', 0 );
 
         // Is oEmbed discovery on?
@@ -1220 +1220 @@
      */
     function parse_oembed( $id, $url, $attr, $rawattr ) {
+        $id = intval( $id );
+
         if ( $id ) {
             // Setup the cachekey
@@ -1230 +1232 @@
             // 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

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

@@ -340 +340 @@
         exit(); // todo: error?
 
-    // Activity content retrieved through AJAX should run through normal filters, but not be
-    // truncated
+    do_action_ref_array( 'bp_dtheme_get_single_activity_content', array( &$activity ) );
+
+    // 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 );
     $content = apply_filters( 'bp_get_activity_content_body', $activity->content );
 
     echo $content;
-
     exit();
 }