Changeset 28846

Timestamp:

06/26/2014 02:29:20 AM (10 years ago)

Author:

wonderboymusic

Message:

When wp_oembed_add_provider() or wp_oembed_remove_provider() is called before the plugins_loaded hook has, store the values statically on the WP_oEmbed object and add them just-in-time when the object is instantiated.

This ensures that all plugins have an accurate provider list when apply_filters( 'oembed_providers', $providers ) is called.

Props kovshenin.
Fixes #28284.

Location:

trunk/src/wp-includes

Files:

• class-oembed.php (modified) (3 diffs)
• media.php (modified) (2 diffs)

trunk/src/wp-includes/class-oembed.php

@@ -20 +20 @@
 class WP_oEmbed {
     public $providers = array();
+    public static $early_providers = array();
 
     /**
@@ -66 +67 @@
         );
 
+        if ( ! empty( self::$early_providers['add'] ) ) {
+            foreach ( self::$early_providers['add'] as $format => $data ) {
+                $providers[ $format ] = $data;
+            }
+        }
+
+        if ( ! empty( self::$early_providers['remove'] ) ) {
+            foreach ( self::$early_providers['remove'] as $format ) {
+                unset( $providers[ $format ] );
+            }
+        }
+
+        self::$early_providers = array();
+
         /**
          * Filter the list of oEmbed providers.
@@ -132 +147 @@
 
         return $provider;
+    }
+
+    public static function _add_provider_early( $format, $provider, $regex = false ) {
+        if ( empty( self::$early_providers['add'] ) ) {
+            self::$early_providers['add'] = array();
+        }
+
+        self::$early_providers['add'][ $format ] = array( $provider, $regex );
+    }
+
+    public static function _remove_provider_early( $format ) {
+        if ( empty( self::$early_providers['remove'] ) ) {
+            self::$early_providers['remove'] = array();
+        }
+
+        self::$early_providers['remove'][] = $format;
     }
 

trunk/src/wp-includes/media.php

@@ -2136 +2136 @@
 function wp_oembed_add_provider( $format, $provider, $regex = false ) {
     require_once( ABSPATH . WPINC . '/class-oembed.php' );
-    $oembed = _wp_oembed_get_object();
-    $oembed->providers[$format] = array( $provider, $regex );
+
+    if ( did_action( 'plugins_loaded' ) ) {
+        $oembed = _wp_oembed_get_object();
+        $oembed->providers[$format] = array( $provider, $regex );
+    } else {
+        WP_oEmbed::_add_provider_early( $format, $provider, $regex );
+    }
 }
 
@@ -2153 +2158 @@
     require_once( ABSPATH . WPINC . '/class-oembed.php' );
 
-    $oembed = _wp_oembed_get_object();
-
-    if ( isset( $oembed->providers[ $format ] ) ) {
-        unset( $oembed->providers[ $format ] );
-        return true;
+    if ( did_action( 'plugins_loaded' ) ) {
+        $oembed = _wp_oembed_get_object();
+
+        if ( isset( $oembed->providers[ $format ] ) ) {
+            unset( $oembed->providers[ $format ] );
+            return true;
+        }
+    } else {
+        WP_oEmbed::_remove_provider_early( $format );
     }