Changeset 4937 for trunk/bp-core/bp-core-classes.php

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

File:

• trunk/bp-core/bp-core-classes.php (modified) (4 diffs)

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