<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[12411] trunk: Remove oEmbed discovery option.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12411">12411</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2009-12-15 21:16:00 +0000 (Tue, 15 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove oEmbed discovery option. Add hook so plugins can enable it. see <a href="http://trac.wordpress.org/ticket/10337">#10337</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesschemaphp">trunk/wp-admin/includes/schema.php</a></li>
<li><a href="#trunkwpadminoptionsmediaphp">trunk/wp-admin/options-media.php</a></li>
<li><a href="#trunkwpadminoptionsphp">trunk/wp-admin/options.php</a></li>
<li><a href="#trunkwpincludesmediaphp">trunk/wp-includes/media.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesschemaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/schema.php (12410 => 12411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/schema.php        2009-12-15 21:04:50 UTC (rev 12410)
+++ trunk/wp-admin/includes/schema.php        2009-12-15 21:16:00 UTC (rev 12411)
</span><span class="lines">@@ -313,7 +313,6 @@
</span><span class="cx">
</span><span class="cx">         // 2.9
</span><span class="cx">         'embed_autourls' => 1,
</span><del>-        'embed_oembed_discover' => 1,
</del><span class="cx">         'embed_size_w' => '',
</span><span class="cx">         'embed_size_h' => 600,
</span><span class="cx">         );
</span></span></pre></div>
<a id="trunkwpadminoptionsmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-media.php (12410 => 12411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-media.php        2009-12-15 21:04:50 UTC (rev 12410)
+++ trunk/wp-admin/options-media.php        2009-12-15 21:16:00 UTC (rev 12411)
</span><span class="lines">@@ -76,16 +76,7 @@
</span><span class="cx"> </fieldset></td>
</span><span class="cx"> </tr>
</span><span class="cx">
</span><del>-<?php if ( current_user_can('unfiltered_html') ) { ?>
</del><span class="cx"> <tr valign="top">
</span><del>-<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">
</del><span class="cx"> <th scope="row"><?php _e('Maximum embed size') ?></th>
</span><span class="cx"> <td>
</span><span class="cx"> <label for="embed_size_w"><?php _e('Width'); ?></label>
</span></span></pre></div>
<a id="trunkwpadminoptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options.php (12410 => 12411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options.php        2009-12-15 21:04:50 UTC (rev 12410)
+++ trunk/wp-admin/options.php        2009-12-15 21:16:00 UTC (rev 12411)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx">         'general' => array( 'blogname', 'blogdescription', 'admin_email', 'users_can_register', 'gmt_offset', 'date_format', 'time_format', 'start_of_week', 'default_role', 'timezone_string' ),
</span><span class="cx">         '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' ),
</span><span class="cx">         'misc' => array( 'use_linksupdate', 'uploads_use_yearmonth_folders', 'upload_path', 'upload_url_path' ),
</span><del>-        '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' ),
</del><ins>+        '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' ),
</ins><span class="cx">         'privacy' => array( 'blog_public' ),
</span><span class="cx">         'reading' => array( 'posts_per_page', 'posts_per_rss', 'rss_use_excerpt', 'blog_charset', 'show_on_front', 'page_on_front', 'page_for_posts' ),
</span><span class="cx">         'writing' => array( 'default_post_edit_rows', 'use_smilies', 'ping_sites', 'mailserver_url', 'mailserver_port', 'mailserver_login', 'mailserver_pass', 'default_category', 'default_email_category', 'use_balanceTags', 'default_link_category', 'enable_app', 'enable_xmlrpc' ),
</span></span></pre></div>
<a id="trunkwpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/media.php (12410 => 12411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/media.php        2009-12-15 21:04:50 UTC (rev 12410)
+++ trunk/wp-includes/media.php        2009-12-15 21:16:00 UTC (rev 12411)
</span><span class="lines">@@ -1099,7 +1099,7 @@
</span><span class="cx">                         }
</span><span class="cx">
</span><span class="cx">                         // Use oEmbed to get the HTML
</span><del>-                        $attr['discover'] = ( get_option( 'embed_oembed_discover' ) && author_can( $post_ID, 'unfiltered_html' ) ) ? true : false;
</del><ins>+                        $attr['discover'] = ( apply_filters('embed_oembed_discover', false) && author_can( $post_ID, 'unfiltered_html' ) ) ? true : false;
</ins><span class="cx">                         $html = wp_oembed_get( $url, $attr );
</span><span class="cx">
</span><span class="cx">                         // Cache the result
</span></span></pre>
</div>
</div>
</body>
</html>