<!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>[12136] trunk: Switch oEmbed option to control discovery.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12136">12136</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2009-11-02 14:41:35 +0000 (Mon, 02 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Switch oEmbed option to control discovery. Tweak whitelist and settings page. Props Viper007Bond. 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="#trunkwpincludesclassoembedphp">trunk/wp-includes/class-oembed.php</a></li>
<li><a href="#trunkwpincludesmediaphp">trunk/wp-includes/media.php</a></li>
<li><a href="#trunkwpincludesversionphp">trunk/wp-includes/version.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 (12135 => 12136)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/schema.php 2009-11-01 10:18:34 UTC (rev 12135)
+++ trunk/wp-admin/includes/schema.php 2009-11-02 14:41:35 UTC (rev 12136)
</span><span class="lines">@@ -316,8 +316,8 @@
</span><span class="cx"> 'timezone_string' => '',
</span><span class="cx">
</span><span class="cx"> // 2.9
</span><del>- 'embed_useoembed' => 1,
</del><span class="cx"> 'embed_autourls' => 1,
</span><ins>+ 'embed_oembed_discover' => 1,
</ins><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 (12135 => 12136)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-media.php 2009-11-01 10:18:34 UTC (rev 12135)
+++ trunk/wp-admin/options-media.php 2009-11-02 14:41:35 UTC (rev 12136)
</span><span class="lines">@@ -77,14 +77,14 @@
</span><span class="cx"> </tr>
</span><span class="cx">
</span><span class="cx"> <tr valign="top">
</span><del>-<th scope="row"><?php _e('oEmbed'); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php printf( __('Use <a href="%s">oEmbed</a> to assist in rich content embedding'), 'http://codex.wordpress.org/oEmbed' ); ?></span></legend>
-<label for="embed_useoembed"><input name="embed_useoembed" type="checkbox" id="embed_useoembed" value="1" <?php checked( '1', get_option('embed_useoembed') ); ?>/> <?php printf( __('Use <a href="%s">oEmbed</a> to allow embedding content from additional websites'), 'http://codex.wordpress.org/oEmbed' ); ?></label>
</del><ins>+<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>
</ins><span class="cx"> </fieldset></td>
</span><span class="cx"> </tr>
</span><span class="cx">
</span><span class="cx"> <tr valign="top">
</span><del>-<th scope="row"><?php _e('Embed size') ?></th>
</del><ins>+<th scope="row"><?php _e('Maximum embed size') ?></th>
</ins><span class="cx"> <td>
</span><span class="cx"> <label for="embed_size_w"><?php _e('Width'); ?></label>
</span><span class="cx"> <input name="embed_size_w" type="text" id="embed_size_w" value="<?php form_option('embed_size_w'); ?>" class="small-text" />
</span></span></pre></div>
<a id="trunkwpadminoptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options.php (12135 => 12136)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options.php 2009-11-01 10:18:34 UTC (rev 12135)
+++ trunk/wp-admin/options.php 2009-11-02 14:41:35 UTC (rev 12136)
</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_useoembed', '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_oembed_discover', '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="trunkwpincludesclassoembedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-oembed.php (12135 => 12136)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-oembed.php 2009-11-01 10:18:34 UTC (rev 12135)
+++ trunk/wp-includes/class-oembed.php 2009-11-02 14:41:35 UTC (rev 12136)
</span><span class="lines">@@ -37,17 +37,17 @@
</span><span class="cx"> // The WP_Embed class disables discovery for non-unfiltered_html users, so only providers in this array will be used for them.
</span><span class="cx"> // Add to this list using the wp_oembed_add_provider() function
</span><span class="cx"> $this->providers = apply_filters( 'oembed_providers', array(
</span><del>- 'http://www.youtube.com/watch*' => array( 'http://www.youtube.com/oembed', false ),
- 'http://blip.tv/file/*' => array( 'http://blip.tv/oembed/', false ),
- '#http://(www\.)?vimeo\.com/.*#i' => array( 'http://www.vimeo.com/api/oembed.{format}', true ),
- 'http://*.flickr.com/*' => array( 'http://www.flickr.com/services/oembed/', false ),
- 'http://www.hulu.com/watch/*' => array( 'http://www.hulu.com/api/oembed.{format}', false ),
- 'http://*.viddler.com/*' => array( 'http://lab.viddler.com/services/oembed/', false ),
- 'http://qik.com/*' => array( 'http://qik.com/api/oembed.{format}', false ),
- 'http://revision3.com/*' => array( 'http://revision3.com/api/oembed/', false ),
- 'http://i*.photobucket.com/albums/*' => array( 'http://photobucket.com/oembed', false ),
- 'http://gi*.photobucket.com/groups/*' => array( 'http://photobucket.com/oembed', false ),
- 'http://www.scribd.com/*' => array( 'http://www.scribd.com/services/oembed', false)
</del><ins>+ '#http://(www\.)?youtube.com/watch.*#i' => array( 'http://www.youtube.com/oembed', true ),
+ 'http://blip.tv/file/*' => array( 'http://blip.tv/oembed/', false ),
+ '#http://(www\.)?vimeo\.com/.*#i' => array( 'http://www.vimeo.com/api/oembed.{format}', true ),
+ '#http://(www\.)?flickr.com/.*' => array( 'http://www.flickr.com/services/oembed/', true ),
+ '#http://(www\.)?hulu.com/watch/.*#i' => array( 'http://www.hulu.com/api/oembed.{format}', true ),
+ '#http://(www\.)?viddler.com/.*#i' => array( 'http://lab.viddler.com/services/oembed/', true ),
+ 'http://qik.com/*' => array( 'http://qik.com/api/oembed.{format}', false ),
+ 'http://revision3.com/*' => array( 'http://revision3.com/api/oembed/', false ),
+ 'http://i*.photobucket.com/albums/*' => array( 'http://photobucket.com/oembed', false ),
+ 'http://gi*.photobucket.com/groups/*' => array( 'http://photobucket.com/oembed', false ),
+ '#http://(www\.)?scribd.com/.*#i' => array( 'http://www.scribd.com/services/oembed', true)
</ins><span class="cx"> ) );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/media.php (12135 => 12136)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/media.php 2009-11-01 10:18:34 UTC (rev 12135)
+++ trunk/wp-includes/media.php 2009-11-02 14:41:35 UTC (rev 12136)
</span><span class="lines">@@ -928,8 +928,7 @@
</span><span class="cx"> add_filter( 'the_content', array(&$this, 'autoembed'), 8 );
</span><span class="cx">
</span><span class="cx"> // After a post is saved, cache oEmbed items via AJAX
</span><del>- if ( get_option('embed_useoembed') )
- add_action( 'edit_form_advanced', array(&$this, 'maybe_run_ajax_cache') );
</del><ins>+ add_action( 'edit_form_advanced', array(&$this, 'maybe_run_ajax_cache') );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -1059,7 +1058,7 @@
</span><span class="cx"> $post_ID = $this->post_ID;
</span><span class="cx">
</span><span class="cx"> // Unknown URL format. Let oEmbed have a go.
</span><del>- if ( $post_ID && get_option('embed_useoembed') ) {
</del><ins>+ if ( $post_ID ) {
</ins><span class="cx">
</span><span class="cx"> // Check for a cached result (stored in the post meta)
</span><span class="cx"> $cachekey = '_oembed_' . md5( $url . implode( '|', $attr ) );
</span><span class="lines">@@ -1075,7 +1074,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Use oEmbed to get the HTML
</span><del>- $attr['discover'] = author_can( $post_ID, 'unfiltered_html' );
</del><ins>+ $attr['discover'] = ( get_option( 'embed_oembed_discover' ) && 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>
<a id="trunkwpincludesversionphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/version.php (12135 => 12136)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/version.php 2009-11-01 10:18:34 UTC (rev 12135)
+++ trunk/wp-includes/version.php 2009-11-02 14:41:35 UTC (rev 12136)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @global int $wp_db_version
</span><span class="cx"> */
</span><del>-$wp_db_version = 12060;
</del><ins>+$wp_db_version = 12136;
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Holds the TinyMCE version
</span></span></pre>
</div>
</div>
</body>
</html>