Changeset 28846 for trunk/src/wp-includes/media.php

Timestamp:

06/26/2014 02:29:20 AM (11 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.

File:

• trunk/src/wp-includes/media.php (modified) (2 diffs)

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 );
     }