Changeset 12411

Timestamp:

12/15/2009 09:16:00 PM (14 years ago)

Author:

ryan

Message:

Remove oEmbed discovery option. Add hook so plugins can enable it. see #10337

Location:

trunk

Files:

• wp-admin/includes/schema.php (modified) (1 diff)
• wp-admin/options-media.php (modified) (1 diff)
• wp-admin/options.php (modified) (1 diff)
• wp-includes/media.php (modified) (1 diff)

trunk/wp-admin/includes/schema.php

@@ -314 +314 @@
     // 2.9
     'embed_autourls' => 1,
-    'embed_oembed_discover' => 1,
     'embed_size_w' => '',
     'embed_size_h' => 600,

trunk/wp-admin/options-media.php

@@ -77 +77 @@
 </tr>
 
-<?php if ( current_user_can('unfiltered_html') ) { ?>
-<tr valign="top">
-<th scope="row"><?php _e('oEmbed discovery'); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php printf( __('Attempt to embed content from unknown URLs using <a href="%s">oEmbed</a>'), 'http://codex.wordpress.org/Embeds#oEmbed' ); ?></span></legend>
-<label for="embed_oembed_discover"><input name="embed_oembed_discover" type="checkbox" id="embed_oembed_discover" value="1" <?php checked( '1', get_option('embed_oembed_discover') ); ?>/> <?php printf( __('Attempt to embed content from unknown URLs using <a href="%s">oEmbed</a>'), 'http://codex.wordpress.org/Embeds#oEmbed' ); ?></label>
-</fieldset></td>
-</tr>
-
-<?php } ?>
 <tr valign="top">
 <th scope="row"><?php _e('Maximum embed size') ?></th>

trunk/wp-admin/options.php

@@ -26 +26 @@
     'discussion' => array( 'default_pingback_flag', 'default_ping_status', 'default_comment_status', 'comments_notify', 'moderation_notify', 'comment_moderation', 'require_name_email', 'comment_whitelist', 'comment_max_links', 'moderation_keys', 'blacklist_keys', 'show_avatars', 'avatar_rating', 'avatar_default', 'close_comments_for_old_posts', 'close_comments_days_old', 'thread_comments', 'thread_comments_depth', 'page_comments', 'comments_per_page', 'default_comments_page', 'comment_order', 'comment_registration' ),
     'misc' => array( 'use_linksupdate', 'uploads_use_yearmonth_folders', 'upload_path', 'upload_url_path' ),
-    'media' => array( 'thumbnail_size_w', 'thumbnail_size_h', 'thumbnail_crop', 'medium_size_w', 'medium_size_h', 'large_size_w', 'large_size_h', 'image_default_size', 'image_default_align', 'image_default_link_type', 'embed_oembed_discover', 'embed_autourls', 'embed_size_w', 'embed_size_h' ),
+    'media' => array( 'thumbnail_size_w', 'thumbnail_size_h', 'thumbnail_crop', 'medium_size_w', 'medium_size_h', 'large_size_w', 'large_size_h', 'image_default_size', 'image_default_align', 'image_default_link_type', 'embed_autourls', 'embed_size_w', 'embed_size_h' ),
     'privacy' => array( 'blog_public' ),
     'reading' => array( 'posts_per_page', 'posts_per_rss', 'rss_use_excerpt', 'blog_charset', 'show_on_front', 'page_on_front', 'page_for_posts' ),

trunk/wp-includes/media.php

@@ -1100 +1100 @@
 
             // Use oEmbed to get the HTML
-            $attr['discover'] = ( get_option( 'embed_oembed_discover' ) && author_can( $post_ID, 'unfiltered_html' ) ) ? true : false;
+            $attr['discover'] = ( apply_filters('embed_oembed_discover', false) && author_can( $post_ID, 'unfiltered_html' ) ) ? true : false;
             $html = wp_oembed_get( $url, $attr );