<!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>[12325] trunk/wp-includes: Use oEmbed for dailymotion.</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12325">12325</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2009-12-06 17:33:53 +0000 (Sun, 06 Dec 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>Use oEmbed for dailymotion. Props Viper007Bond. see <a href="http://trac.wordpress.org/ticket/10337">#10337</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 (12324 => 12325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-oembed.php        2009-12-06 17:30:56 UTC (rev 12324)
+++ trunk/wp-includes/class-oembed.php        2009-12-06 17:33:53 UTC (rev 12325)
</span><span class="lines">@@ -40,14 +40,15 @@
</span><span class="cx">                         '#http://(www\.)?youtube.com/watch.*#i' =&gt; array( 'http://www.youtube.com/oembed',            true  ),
</span><span class="cx">                         'http://blip.tv/file/*'                 =&gt; array( 'http://blip.tv/oembed/',                   false ),
</span><span class="cx">                         '#http://(www\.)?vimeo\.com/.*#i'       =&gt; array( 'http://www.vimeo.com/api/oembed.{format}', true  ),
</span><del>-                        '#http://(www\.)?flickr.com/.*#i'       =&gt; array( 'http://www.flickr.com/services/oembed/',   true  ),
-                        '#http://(www\.)?hulu.com/watch/.*#i'   =&gt; array( 'http://www.hulu.com/api/oembed.{format}',  true  ),
-                        '#http://(www\.)?viddler.com/.*#i'      =&gt; array( 'http://lab.viddler.com/services/oembed/',  true  ),
</del><ins>+                        '#http://(www\.)?dailymotion\.com/.*#i' =&gt; array( 'http://www.dailymotion.com/api/oembed',    true  ),
+                        '#http://(www\.)?flickr\.com/.*#i'      =&gt; array( 'http://www.flickr.com/services/oembed/',   true  ),
+                        '#http://(www\.)?hulu\.com/watch/.*#i'  =&gt; array( 'http://www.hulu.com/api/oembed.{format}',  true  ),
+                        '#http://(www\.)?viddler\.com/.*#i'     =&gt; array( 'http://lab.viddler.com/services/oembed/',  true  ),
</ins><span class="cx">                         'http://qik.com/*'                      =&gt; array( 'http://qik.com/api/oembed.{format}',       false ),
</span><span class="cx">                         'http://revision3.com/*'                =&gt; array( 'http://revision3.com/api/oembed/',         false ),
</span><span class="cx">                         'http://i*.photobucket.com/albums/*'    =&gt; array( 'http://photobucket.com/oembed',            false ),
</span><span class="cx">                         'http://gi*.photobucket.com/groups/*'   =&gt; array( 'http://photobucket.com/oembed',            false ),
</span><del>-                        '#http://(www\.)?scribd.com/.*#i'       =&gt; array( 'http://www.scribd.com/services/oembed',    true  ),
</del><ins>+                        '#http://(www\.)?scribd\.com/.*#i'      =&gt; array( 'http://www.scribd.com/services/oembed',    true  ),
</ins><span class="cx">                         'http://wordpress.tv/*'                 =&gt; array( 'http://wordpress.tv/oembed/',              false ),
</span><span class="cx">                 ) );
</span><span class="cx"> 
</span><span class="lines">@@ -265,3 +266,5 @@
</span><span class="cx"> 
</span><span class="cx">         return $wp_oembed;
</span><span class="cx"> }
</span><ins>+
+?&gt;
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludesdefaultembedsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/default-embeds.php (12324 => 12325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/default-embeds.php        2009-12-06 17:30:56 UTC (rev 12324)
+++ trunk/wp-includes/default-embeds.php        2009-12-06 17:33:53 UTC (rev 12325)
</span><span class="lines">@@ -49,27 +49,4 @@
</span><span class="cx"> }
</span><span class="cx"> wp_embed_register_handler( 'polldaddy', '#http://answers.polldaddy.com/poll/(\d+)(.*?)#i', 'wp_embed_handler_polldaddy' );
</span><span class="cx"> 
</span><del>-/**
- * The DailyMotion.com embed handler callback. DailyMotion does not support oEmbed.
- *
- * @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_dailymotion( $matches, $attr, $url, $rawattr ) {
-        // If the user supplied a fixed width AND height, use it
-        if ( !empty($rawattr['width']) &amp;&amp; !empty($rawattr['height']) ) {
-                $width  = (int) $rawattr['width'];
-                $height = (int) $rawattr['height'];
-        } else {
-                list( $width, $height ) = wp_expand_dimensions( 480, 291, $attr['width'], $attr['height'] );
-        }
-
-        return apply_filters( 'embed_dailymotion', '&lt;object width=&quot;' . esc_attr($width) . '&quot; height=&quot;' . esc_attr($height) . '&quot; classid=&quot;clsid:d27cdb6e-ae6d-11cf-96b8-444553540000&quot;&gt;&lt;param name=&quot;movie&quot; value=&quot;http://www.dailymotion.com/swf/' . esc_attr($matches[3]) . '&amp;amp;related=0&quot;&gt;&lt;/param&gt;&lt;param name=&quot;allowFullScreen&quot; value=&quot;true&quot;&gt;&lt;/param&gt;&lt;param name=&quot;allowScriptAccess&quot; value=&quot;always&quot;&gt;&lt;/param&gt;&lt;embed src=&quot;http://www.dailymotion.com/swf/' . esc_attr($matches[3]) . '&amp;amp;related=0&quot; type=&quot;application/x-shockwave-flash&quot; width=&quot;' . esc_attr($width) . '&quot; height=&quot;' . esc_attr($height) . '&quot; allowFullScreen=&quot;true&quot; allowScriptAccess=&quot;always&quot;&gt;&lt;/embed&gt;&lt;/object&gt;', $matches, $attr, $url, $rawattr );;
-}
-wp_embed_register_handler( 'dailymotion', '#http://(www.dailymotion|dailymotion)\.com/(.+)/([0-9a-zA-Z]+)\_(.*?)#i', 'wp_embed_handler_dailymotion' );
</del><ins>+?&gt;
</ins><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>

</body>
</html>