Ticket #2707: 2707.002.patch

buddypress/bp-core/bp-core-classes.php

@@ -684 +684 @@
         }
 }
 
+/**
+ * BP_Embed
+ *
+ * Extends WP_Embed class for use with BuddyPress.
+ *
+ * @package BuddyPress Core
+ * @since 1.3
+ * @see WP_Embed
+ */
+class BP_Embed extends WP_Embed {
+
+        /**
+         * PHP4 constructor
+         */
+        function BP_Embed() {
+                return $this->__construct();
+        }
+
+        /**
+         * PHP5 constructor
+         */
+        function __construct() {
+                global $wp_embed;
+
+                // Make sure we populate the WP_Embed handlers array.
+                // These are providers that use a regex callback on the URL in question.
+                // Do not confuse with oEmbed providers, which require an external ping.
+                // Used in WP_Embed::shortcode()
+                $this->handlers = $wp_embed->handlers;
+
+                if( !defined( 'BP_EMBED_DISABLE_ACTIVITY' ) ) {
+                        add_filter( 'bp_get_activity_content_body', array(&$this, 'autoembed'), 9 );
+                        add_filter( 'bp_get_activity_content_body', array(&$this, 'run_shortcode'), 8 );
+                }
+
+                if( !defined( 'BP_EMBED_DISABLE_ACTIVITY_REPLIES' ) ) {
+                        add_filter( 'bp_get_activity_content', array(&$this, 'autoembed'), 9 );
+                        add_filter( 'bp_get_activity_content', array(&$this, 'run_shortcode'), 8 );
+                }
+
+                if( !defined( 'BP_EMBED_DISABLE_FORUM_POSTS' ) ) {
+                        add_filter( 'bp_get_the_topic_post_content', array(&$this, 'autoembed'), 9 );
+                        add_filter( 'bp_get_the_topic_post_content', array(&$this, 'run_shortcode'), 8 );
+                }
+        }
+
+        /**
+         * Base function so BP components / plugins can parse links to be embedded.
+         * View examples to add support in {@link bp_embed_init()}.
+         * Overrides {@link WP_Embed::shortcode()}.
+         *
+         * @uses wp_parse_args()
+         * @uses wp_embed_defaults()
+         * @uses _wp_oembed_get_object()
+         * @uses wp_oembed_get() Connects to oEmbed provider and returns HTML on success.
+         * @uses WP_Embed::maybe_make_link() Process URL for hyperlinking on oEmbed failure.
+         * @param string $url The URL attempting to be embedded.
+         * @param array $attr Shortcode attributes from {@link WP_Embed::shortcode()}.
+         * @return string The embed HTML on success, otherwise the original URL.
+         */
+        function shortcode( $attr, $url = '' ) {
+                if ( empty($url) )
+                        return '';
+
+                $rawattr = $attr;
+                $attr = wp_parse_args( $attr, wp_embed_defaults() );
+
+                // Look for known internal handlers
+                ksort( $this->handlers );
+                foreach ( $this->handlers as $priority => $handlers ) {
+                        foreach ( $handlers as $id => $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 );
+                                }
+                        }
+                }
+
+                // Get object ID
+                $id = apply_filters( 'bp_embed_object_id', $id );
+
+                // Is oEmbed discovery on?
+                $attr['discover'] = apply_filters( 'bp_embed_oembed_discover', false );
+
+                // Set up a new WP oEmbed object to check URL with registered oEmbed providers
+                require_once( ABSPATH . WPINC . '/class-oembed.php' );
+                $oembed_obj = _wp_oembed_get_object();
+
+                // If oEmbed discovery is true, skip oEmbed provider check
+                $is_oembed_link = false;
+                if ( !$attr['discover'] ) {
+                        foreach ( (array)$oembed_obj->providers as $provider_matchmask => $provider ) {
+                                $regex = ( $is_regex = $provider[1] ) ? $provider_matchmask : '#' . str_replace( '___wildcard___', '(.+)', preg_quote( str_replace( '*', '___wildcard___', $provider_matchmask ), '#' ) ) . '#i';
+
+                                if ( preg_match( $regex, $url ) )
+                                        $is_oembed_link = true;
+                        }
+
+                        // If URL doesn't match a WP oEmbed provider, stop parsing and return link
+                        if ( !$is_oembed_link )
+                                return $this->maybe_make_link( $url );  
+                }
+
+                // Check to see if an object ID was passed
+                if ( $id ) {
+                        // Setup the cachekey
+                        $cachekey = '_oembed_' . md5( $url . serialize( $attr ) );
+
+                        // Let components / plugins grab their cache
+                        $cache = apply_filters( 'bp_embed_get_cache', $cache, $id, $cachekey, $url, $attr, $rawattr );
+
+                        // Grab cache and return it if available
+                        if ( !empty($cache) ) {
+                                return apply_filters( 'embed_oembed_html', $cache, $url, $attr, $rawattr );
+                        }
+                        // If no cache, ping the oEmbed provider and cache the result
+                        else {
+                                $html = wp_oembed_get( $url, $attr );
+                                $cache = ( $html ) ? $html : $url;
+
+                                // Let components / plugins save their cache
+                                do_action( 'bp_embed_update_cache', $cache, $cachekey, $id );
+
+                                // If there was a result, return it
+                                if ( $html )
+                                        return apply_filters( 'embed_oembed_html', $html, $url, $attr, $rawattr );
+                        }
+                }
+
+                // Still unknown
+                return $this->maybe_make_link( $url );
+        }
+}
+
 ?>

buddypress/bp-core/bp-core-embed.php

@@ +1 @@
+<?php
+/**
+ * bp_embed_init()
+ *
+ * Initializes {@link BP_Embed} after everything is loaded.
+ * This is to ensure the {@link WP_Embed} handlers array is populated,
+ * as well as making sure all BP components are loaded before we do any conditional checks,
+ * and that activity updates created by AJAX get parsed.
+ *
+ * @package BuddyPress Core
+ * @since 1.3
+ */
+function bp_embed_init() {
+        $bp_embed = new BP_Embed();
+
+        // Check activity component
+        if ( bp_is_activity_component() || ( bp_is_group_home() && bp_is_active('activity') ) ) {
+                add_filter( 'bp_embed_object_id', 'bp_get_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 );           
+        }
+
+        // Check forum component
+        if ( bp_is_group_forum_topic() ) {
+                add_filter( 'bp_embed_object_id', 'bp_get_the_topic_post_id' );
+                add_filter( 'bp_embed_get_cache', 'bp_embed_forum_cache', 10, 3 );
+                add_action( 'bp_embed_update_cache', 'bp_embed_forum_save_cache', 10, 3 );
+        }
+}
+add_action( 'init', 'bp_embed_init' );
+
+/* ACTIVITY COMPONENT */
+function bp_embed_activity_cache( $cache, $id, $cachekey ) {
+        return bp_activity_get_meta( $id, $cachekey );
+}
+
+function bp_embed_activity_save_cache( $cache, $cachekey, $id ) {
+        bp_activity_update_meta( $id, $cachekey, $cache );
+}
+
+/* FORUMS COMPONENT */
+function bp_embed_forum_cache( $cache, $id, $cachekey ) {
+        return bb_get_postmeta( $id, $cachekey );
+}
+
+function bp_embed_forum_save_cache( $cache, $cachekey, $id ) {
+        bb_update_postmeta( $id, $cachekey, $cache );
+}
+?>

buddypress/bp-forums/bp-forums-filters.php

@@ -45 +45 @@
 add_filter( 'bp_get_the_topic_latest_post_excerpt', 'bp_forums_make_nofollow_filter' );
 add_filter( 'bp_get_the_topic_post_content', 'bp_forums_make_nofollow_filter' );
 
+// Allow shortcodes in forum posts
+add_filter( 'bp_get_the_topic_post_content', 'do_shortcode' );
+
 function bp_forums_filter_kses( $content ) {
         global $allowedtags;
 

buddypress/bp-core.php

@@ -37 +37 @@
 require ( BP_PLUGIN_DIR . '/bp-core/bp-core-widgets.php' );
 require ( BP_PLUGIN_DIR . '/bp-core/bp-core-notifications.php' );
 require ( BP_PLUGIN_DIR . '/bp-core/bp-core-signup.php' );
+require ( BP_PLUGIN_DIR . '/bp-core/bp-core-embed.php' );
 
 /* If BP_DISABLE_ADMIN_BAR is defined, do not load the global admin bar. */
 if ( !defined( 'BP_DISABLE_ADMIN_BAR' ) )