Changeset 12136 for trunk/wp-includes/media.php

Timestamp:

11/02/2009 02:41:35 PM (16 years ago)

Author:

ryan

Message:

Switch oEmbed option to control discovery. Tweak whitelist and settings page. Props Viper007Bond. see #10337

File:

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

trunk/wp-includes/media.php

@@ -929 +929 @@
 
         // After a post is saved, cache oEmbed items via AJAX
-        if ( get_option('embed_useoembed') )
-            add_action( 'edit_form_advanced', array(&$this, 'maybe_run_ajax_cache') );
+        add_action( 'edit_form_advanced', array(&$this, 'maybe_run_ajax_cache') );
     }
 
@@ -1060 +1059 @@
 
         // Unknown URL format. Let oEmbed have a go.
-        if ( $post_ID && get_option('embed_useoembed') ) {
+        if ( $post_ID ) {
 
             // Check for a cached result (stored in the post meta)
@@ -1076 +1075 @@
 
             // Use oEmbed to get the HTML
-            $attr['discover'] = author_can( $post_ID, 'unfiltered_html' );
+            $attr['discover'] = ( get_option( 'embed_oembed_discover' ) && author_can( $post_ID, 'unfiltered_html' ) ) ? true : false;
             $html = wp_oembed_get( $url, $attr );