<!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>[13021] trunk/wp-includes: Use oEmbed for PollDaddy.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13021">13021</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-02-08 16:15:13 +0000 (Mon, 08 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use oEmbed for PollDaddy. Props Viper007Bond. fixes <a href="http://trac.wordpress.org/ticket/12174">#12174</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesclassoembedphp">trunk/wp-includes/class-oembed.php</a></li>
<li><a href="#trunkwpincludesdefaultembedsphp">trunk/wp-includes/default-embeds.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesclassoembedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-oembed.php (13020 => 13021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-oembed.php 2010-02-07 23:19:39 UTC (rev 13020)
+++ trunk/wp-includes/class-oembed.php 2010-02-08 16:15:13 UTC (rev 13021)
</span><span class="lines">@@ -37,19 +37,20 @@
</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 (see it's PHPDoc for details).
</span><span class="cx"> $this->providers = apply_filters( 'oembed_providers', array(
</span><del>- '#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\.)?dailymotion\.com/.*#i' => array( 'http://www.dailymotion.com/api/oembed', true ),
- '#http://(www\.)?flickr\.com/.*#i' => 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 ),
- 'http://wordpress.tv/*' => array( 'http://wordpress.tv/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\.)?dailymotion\.com/.*#i' => array( 'http://www.dailymotion.com/api/oembed', true ),
+ '#http://(www\.)?flickr\.com/.*#i' => 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 ),
+ 'http://wordpress.tv/*' => array( 'http://wordpress.tv/oembed/', false ),
+ '#http://(answers|surveys)\.polldaddy.com/.*#i' => array( 'http://polldaddy.com/oembed/', true ),
</ins><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> // Fix Scribd embeds. They contain new lines in the middle of the HTML which breaks wpautop().
</span></span></pre></div>
<a id="trunkwpincludesdefaultembedsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/default-embeds.php (13020 => 13021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/default-embeds.php 2010-02-07 23:19:39 UTC (rev 13020)
+++ trunk/wp-includes/default-embeds.php 2010-02-08 16:15:13 UTC (rev 13021)
</span><span class="lines">@@ -32,21 +32,4 @@
</span><span class="cx"> }
</span><span class="cx"> wp_embed_register_handler( 'googlevideo', '#http://video\.google\.([A-Za-z.]{2,5})/videoplay\?docid=([\d-]+)(.*?)#i', 'wp_embed_handler_googlevideo' );
</span><span class="cx">
</span><del>-/**
- * The PollDaddy.com embed handler callback. PollDaddy does not support oEmbed, at least not yet.
- *
- * @see WP_Embed::register_handler()
- * @see WP_Embed::shortcode()
- *
- * @param array $matches The regex matches from the provided regex when calling {@link wp_embed_register_handler()}.
- * @param array $attr Embed attributes.
- * @param string $url The original URL that was matched by the regex.
- * @param array $rawattr The original unmodified attributes.
- * @return string The embed HTML.
- */
-function wp_embed_handler_polldaddy( $matches, $attr, $url, $rawattr ) {
- return apply_filters( 'embed_polldaddy', '<script type="text/javascript" charset="utf8" src="http://s3.polldaddy.com/p/' . esc_attr($matches[1]) . '"></script>', $matches, $attr, $url, $rawattr );
-}
-wp_embed_register_handler( 'polldaddy', '#http://answers.polldaddy.com/poll/(\d+)(.*?)#i', 'wp_embed_handler_polldaddy' );
-
</del><span class="cx"> ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>