<!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" />
<title>[21999] trunk: Move WP_Embed into its own file.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/21999">21999</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-09-25 08:39:26 +0000 (Tue, 25 Sep 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move WP_Embed into its own file. props ocean90. fixes <a href="http://core.trac.wordpress.org/ticket/20533">#20533</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesmediaphp">trunk/wp-includes/media.php</a></li>
<li><a href="#trunkwpsettingsphp">trunk/wp-settings.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkwpincludesclasswpembedphp">trunk/wp-includes/class-wp-embed.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesclasswpembedphpfromrev21998trunkwpincludesmediaphp"></a>
<div class="copfile"><h4>Copied: trunk/wp-includes/class-wp-embed.php (from rev 21998, trunk/wp-includes/media.php) (0 => 21999)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-embed.php (rev 0)
+++ trunk/wp-includes/class-wp-embed.php 2012-09-25 08:39:26 UTC (rev 21999)
</span><span class="lines">@@ -0,0 +1,277 @@
</span><ins>+<?php
+/**
+ * API for easily embedding rich media such as videos and images into content.
+ *
+ * @package WordPress
+ * @subpackage Embed
+ * @since 2.9.0
+ */
+class WP_Embed {
+ var $handlers = array();
+ var $post_ID;
+ var $usecache = true;
+ var $linkifunknown = true;
+
+ /**
+ * Constructor
+ */
+ function __construct() {
+ // Hack to get the [embed] shortcode to run before wpautop()
+ add_filter( 'the_content', array( $this, 'run_shortcode' ), 8 );
+
+ // Shortcode placeholder for strip_shortcodes()
+ add_shortcode( 'embed', '__return_false' );
+
+ // Attempts to embed all URLs in a post
+ add_filter( 'the_content', array( $this, 'autoembed' ), 8 );
+
+ // After a post is saved, invalidate the oEmbed cache
+ add_action( 'save_post', array( $this, 'delete_oembed_caches' ) );
+
+ // After a post is saved, cache oEmbed items via AJAX
+ add_action( 'edit_form_advanced', array( $this, 'maybe_run_ajax_cache' ) );
+ }
+
+ /**
+ * Process the [embed] shortcode.
+ *
+ * Since the [embed] shortcode needs to be run earlier than other shortcodes,
+ * this function removes all existing shortcodes, registers the [embed] shortcode,
+ * calls {@link do_shortcode()}, and then re-registers the old shortcodes.
+ *
+ * @uses $shortcode_tags
+ * @uses remove_all_shortcodes()
+ * @uses add_shortcode()
+ * @uses do_shortcode()
+ *
+ * @param string $content Content to parse
+ * @return string Content with shortcode parsed
+ */
+ function run_shortcode( $content ) {
+ global $shortcode_tags;
+
+ // Back up current registered shortcodes and clear them all out
+ $orig_shortcode_tags = $shortcode_tags;
+ remove_all_shortcodes();
+
+ add_shortcode( 'embed', array( $this, 'shortcode' ) );
+
+ // Do the shortcode (only the [embed] one is registered)
+ $content = do_shortcode( $content );
+
+ // Put the original shortcodes back
+ $shortcode_tags = $orig_shortcode_tags;
+
+ return $content;
+ }
+
+ /**
+ * If a post/page was saved, then output JavaScript to make
+ * an AJAX request that will call WP_Embed::cache_oembed().
+ */
+ function maybe_run_ajax_cache() {
+ $post = get_post();
+
+ if ( ! $post || empty($_GET['message']) || 1 != $_GET['message'] )
+ return;
+
+?>
+<script type="text/javascript">
+/* <![CDATA[ */
+ jQuery(document).ready(function($){
+ $.get("<?php echo admin_url( 'admin-ajax.php?action=oembed-cache&post=' . $post->ID, 'relative' ); ?>");
+ });
+/* ]]> */
+</script>
+<?php
+ }
+
+ /**
+ * Register an embed handler. Do not use this function directly, use {@link wp_embed_register_handler()} instead.
+ * This function should probably also only be used for sites that do not support oEmbed.
+ *
+ * @param string $id An internal ID/name for the handler. Needs to be unique.
+ * @param string $regex The regex that will be used to see if this handler should be used for a URL.
+ * @param callback $callback The callback function that will be called if the regex is matched.
+ * @param int $priority Optional. Used to specify the order in which the registered handlers will be tested (default: 10). Lower numbers correspond with earlier testing, and handlers with the same priority are tested in the order in which they were added to the action.
+ */
+ function register_handler( $id, $regex, $callback, $priority = 10 ) {
+ $this->handlers[$priority][$id] = array(
+ 'regex' => $regex,
+ 'callback' => $callback,
+ );
+ }
+
+ /**
+ * Unregister a previously registered embed handler. Do not use this function directly, use {@link wp_embed_unregister_handler()} instead.
+ *
+ * @param string $id The handler ID that should be removed.
+ * @param int $priority Optional. The priority of the handler to be removed (default: 10).
+ */
+ function unregister_handler( $id, $priority = 10 ) {
+ if ( isset($this->handlers[$priority][$id]) )
+ unset($this->handlers[$priority][$id]);
+ }
+
+ /**
+ * The {@link do_shortcode()} callback function.
+ *
+ * Attempts to convert a URL into embed HTML. Starts by checking the URL against the regex of the registered embed handlers.
+ * If none of the regex matches and it's enabled, then the URL will be given to the {@link WP_oEmbed} class.
+ *
+ * @uses wp_oembed_get()
+ * @uses wp_parse_args()
+ * @uses wp_embed_defaults()
+ * @uses WP_Embed::maybe_make_link()
+ * @uses get_option()
+ * @uses author_can()
+ * @uses wp_cache_get()
+ * @uses wp_cache_set()
+ * @uses get_post_meta()
+ * @uses update_post_meta()
+ *
+ * @param array $attr Shortcode attributes.
+ * @param string $url The URL attempting to be embedded.
+ * @return string The embed HTML on success, otherwise the original URL.
+ */
+ function shortcode( $attr, $url = '' ) {
+ $post = get_post();
+
+ if ( empty( $url ) )
+ return '';
+
+ $rawattr = $attr;
+ $attr = wp_parse_args( $attr, wp_embed_defaults() );
+
+ // kses converts & into &amp; and we need to undo this
+ // See http://core.trac.wordpress.org/ticket/11311
+ $url = str_replace( '&amp;', '&', $url );
+
+ // Look for known internal handlers
+ ksort( $this->handlers );
+ foreach ( $this->handlers as $priority => $handlers ) {
+ foreach ( $handlers as $id => $handler ) {
+ if ( preg_match( $handler['regex'], $url, $matches ) && is_callable( $handler['callback'] ) ) {
+ if ( false !== $return = call_user_func( $handler['callback'], $matches, $attr, $url, $rawattr ) )
+ return apply_filters( 'embed_handler_html', $return, $url, $attr );
+ }
+ }
+ }
+
+ $post_ID = ( ! empty( $post->ID ) ) ? $post->ID : null;
+ if ( ! empty( $this->post_ID ) ) // Potentially set by WP_Embed::cache_oembed()
+ $post_ID = $this->post_ID;
+
+ // Unknown URL format. Let oEmbed have a go.
+ if ( $post_ID ) {
+
+ // Check for a cached result (stored in the post meta)
+ $cachekey = '_oembed_' . md5( $url . serialize( $attr ) );
+ if ( $this->usecache ) {
+ $cache = get_post_meta( $post_ID, $cachekey, true );
+
+ // Failures are cached
+ if ( '{{unknown}}' === $cache )
+ return $this->maybe_make_link( $url );
+
+ if ( ! empty( $cache ) )
+ return apply_filters( 'embed_oembed_html', $cache, $url, $attr, $post_ID );
+ }
+
+ // Use oEmbed to get the HTML
+ $attr['discover'] = ( apply_filters('embed_oembed_discover', false) && author_can( $post_ID, 'unfiltered_html' ) );
+ $html = wp_oembed_get( $url, $attr );
+
+ // Cache the result
+ $cache = ( $html ) ? $html : '{{unknown}}';
+ update_post_meta( $post_ID, $cachekey, $cache );
+
+ // If there was a result, return it
+ if ( $html )
+ return apply_filters( 'embed_oembed_html', $html, $url, $attr, $post_ID );
+ }
+
+ // Still unknown
+ return $this->maybe_make_link( $url );
+ }
+
+ /**
+ * Delete all oEmbed caches.
+ *
+ * @param int $post_ID Post ID to delete the caches for.
+ */
+ function delete_oembed_caches( $post_ID ) {
+ $post_metas = get_post_custom_keys( $post_ID );
+ if ( empty($post_metas) )
+ return;
+
+ foreach( $post_metas as $post_meta_key ) {
+ if ( '_oembed_' == substr( $post_meta_key, 0, 8 ) )
+ delete_post_meta( $post_ID, $post_meta_key );
+ }
+ }
+
+ /**
+ * Triggers a caching of all oEmbed results.
+ *
+ * @param int $post_ID Post ID to do the caching for.
+ */
+ function cache_oembed( $post_ID ) {
+ $post = get_post( $post_ID );
+
+ if ( empty($post->ID) || !in_array( $post->post_type, apply_filters( 'embed_cache_oembed_types', array( 'post', 'page' ) ) ) )
+ return;
+
+ // Trigger a caching
+ if ( !empty($post->post_content) ) {
+ $this->post_ID = $post->ID;
+ $this->usecache = false;
+
+ $content = $this->run_shortcode( $post->post_content );
+ $this->autoembed( $content );
+
+ $this->usecache = true;
+ }
+ }
+
+ /**
+ * Passes any unlinked URLs that are on their own line to {@link WP_Embed::shortcode()} for potential embedding.
+ *
+ * @uses WP_Embed::autoembed_callback()
+ *
+ * @param string $content The content to be searched.
+ * @return string Potentially modified $content.
+ */
+ function autoembed( $content ) {
+ return preg_replace_callback( '|^\s*(https?://[^\s"]+)\s*$|im', array( $this, 'autoembed_callback' ), $content );
+ }
+
+ /**
+ * Callback function for {@link WP_Embed::autoembed()}.
+ *
+ * @uses WP_Embed::shortcode()
+ *
+ * @param array $match A regex match array.
+ * @return string The embed HTML on success, otherwise the original URL.
+ */
+ function autoembed_callback( $match ) {
+ $oldval = $this->linkifunknown;
+ $this->linkifunknown = false;
+ $return = $this->shortcode( array(), $match[1] );
+ $this->linkifunknown = $oldval;
+
+ return "\n$return\n";
+ }
+
+ /**
+ * Conditionally makes a hyperlink based on an internal class variable.
+ *
+ * @param string $url URL to potentially be linked.
+ * @return string Linked URL or the original URL.
+ */
+ function maybe_make_link( $url ) {
+ $output = ( $this->linkifunknown ) ? '<a href="' . esc_attr($url) . '">' . esc_html($url) . '</a>' : $url;
+ return apply_filters( 'embed_maybe_make_link', $output, $url );
+ }
+}
+$GLOBALS['wp_embed'] = new WP_Embed();
</ins></span></pre></div>
<a id="trunkwpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/media.php (21998 => 21999)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/media.php 2012-09-25 07:10:09 UTC (rev 21998)
+++ trunk/wp-includes/media.php 2012-09-25 08:39:26 UTC (rev 21999)
</span><span class="lines">@@ -1064,283 +1064,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * API for easily embedding rich media such as videos and images into content.
- *
- * @package WordPress
- * @subpackage Embed
- * @since 2.9.0
- */
-class WP_Embed {
- var $handlers = array();
- var $post_ID;
- var $usecache = true;
- var $linkifunknown = true;
-
- /**
- * Constructor
- */
- function __construct() {
- // Hack to get the [embed] shortcode to run before wpautop()
- add_filter( 'the_content', array( $this, 'run_shortcode' ), 8 );
-
- // Shortcode placeholder for strip_shortcodes()
- add_shortcode( 'embed', '__return_false' );
-
- // Attempts to embed all URLs in a post
- add_filter( 'the_content', array( $this, 'autoembed' ), 8 );
-
- // After a post is saved, invalidate the oEmbed cache
- add_action( 'save_post', array( $this, 'delete_oembed_caches' ) );
-
- // After a post is saved, cache oEmbed items via AJAX
- add_action( 'edit_form_advanced', array( $this, 'maybe_run_ajax_cache' ) );
- }
-
- /**
- * Process the [embed] shortcode.
- *
- * Since the [embed] shortcode needs to be run earlier than other shortcodes,
- * this function removes all existing shortcodes, registers the [embed] shortcode,
- * calls {@link do_shortcode()}, and then re-registers the old shortcodes.
- *
- * @uses $shortcode_tags
- * @uses remove_all_shortcodes()
- * @uses add_shortcode()
- * @uses do_shortcode()
- *
- * @param string $content Content to parse
- * @return string Content with shortcode parsed
- */
- function run_shortcode( $content ) {
- global $shortcode_tags;
-
- // Back up current registered shortcodes and clear them all out
- $orig_shortcode_tags = $shortcode_tags;
- remove_all_shortcodes();
-
- add_shortcode( 'embed', array( $this, 'shortcode' ) );
-
- // Do the shortcode (only the [embed] one is registered)
- $content = do_shortcode( $content );
-
- // Put the original shortcodes back
- $shortcode_tags = $orig_shortcode_tags;
-
- return $content;
- }
-
- /**
- * If a post/page was saved, then output JavaScript to make
- * an AJAX request that will call WP_Embed::cache_oembed().
- */
- function maybe_run_ajax_cache() {
- $post = get_post();
-
- if ( ! $post || empty($_GET['message']) || 1 != $_GET['message'] )
- return;
-
-?>
-<script type="text/javascript">
-/* <![CDATA[ */
- jQuery(document).ready(function($){
- $.get("<?php echo admin_url( 'admin-ajax.php?action=oembed-cache&post=' . $post->ID, 'relative' ); ?>");
- });
-/* ]]> */
-</script>
-<?php
- }
-
- /**
- * Register an embed handler. Do not use this function directly, use {@link wp_embed_register_handler()} instead.
- * This function should probably also only be used for sites that do not support oEmbed.
- *
- * @param string $id An internal ID/name for the handler. Needs to be unique.
- * @param string $regex The regex that will be used to see if this handler should be used for a URL.
- * @param callback $callback The callback function that will be called if the regex is matched.
- * @param int $priority Optional. Used to specify the order in which the registered handlers will be tested (default: 10). Lower numbers correspond with earlier testing, and handlers with the same priority are tested in the order in which they were added to the action.
- */
- function register_handler( $id, $regex, $callback, $priority = 10 ) {
- $this->handlers[$priority][$id] = array(
- 'regex' => $regex,
- 'callback' => $callback,
- );
- }
-
- /**
- * Unregister a previously registered embed handler. Do not use this function directly, use {@link wp_embed_unregister_handler()} instead.
- *
- * @param string $id The handler ID that should be removed.
- * @param int $priority Optional. The priority of the handler to be removed (default: 10).
- */
- function unregister_handler( $id, $priority = 10 ) {
- if ( isset($this->handlers[$priority][$id]) )
- unset($this->handlers[$priority][$id]);
- }
-
- /**
- * The {@link do_shortcode()} callback function.
- *
- * Attempts to convert a URL into embed HTML. Starts by checking the URL against the regex of the registered embed handlers.
- * If none of the regex matches and it's enabled, then the URL will be given to the {@link WP_oEmbed} class.
- *
- * @uses wp_oembed_get()
- * @uses wp_parse_args()
- * @uses wp_embed_defaults()
- * @uses WP_Embed::maybe_make_link()
- * @uses get_option()
- * @uses author_can()
- * @uses wp_cache_get()
- * @uses wp_cache_set()
- * @uses get_post_meta()
- * @uses update_post_meta()
- *
- * @param array $attr Shortcode attributes.
- * @param string $url The URL attempting to be embedded.
- * @return string The embed HTML on success, otherwise the original URL.
- */
- function shortcode( $attr, $url = '' ) {
- $post = get_post();
-
- if ( empty( $url ) )
- return '';
-
- $rawattr = $attr;
- $attr = wp_parse_args( $attr, wp_embed_defaults() );
-
- // kses converts & into &amp; and we need to undo this
- // See http://core.trac.wordpress.org/ticket/11311
- $url = str_replace( '&amp;', '&', $url );
-
- // Look for known internal handlers
- ksort( $this->handlers );
- foreach ( $this->handlers as $priority => $handlers ) {
- foreach ( $handlers as $id => $handler ) {
- if ( preg_match( $handler['regex'], $url, $matches ) && is_callable( $handler['callback'] ) ) {
- if ( false !== $return = call_user_func( $handler['callback'], $matches, $attr, $url, $rawattr ) )
- return apply_filters( 'embed_handler_html', $return, $url, $attr );
- }
- }
- }
-
- $post_ID = ( ! empty( $post->ID ) ) ? $post->ID : null;
- if ( ! empty( $this->post_ID ) ) // Potentially set by WP_Embed::cache_oembed()
- $post_ID = $this->post_ID;
-
- // Unknown URL format. Let oEmbed have a go.
- if ( $post_ID ) {
-
- // Check for a cached result (stored in the post meta)
- $cachekey = '_oembed_' . md5( $url . serialize( $attr ) );
- if ( $this->usecache ) {
- $cache = get_post_meta( $post_ID, $cachekey, true );
-
- // Failures are cached
- if ( '{{unknown}}' === $cache )
- return $this->maybe_make_link( $url );
-
- if ( ! empty( $cache ) )
- return apply_filters( 'embed_oembed_html', $cache, $url, $attr, $post_ID );
- }
-
- // Use oEmbed to get the HTML
- $attr['discover'] = ( apply_filters('embed_oembed_discover', false) && author_can( $post_ID, 'unfiltered_html' ) );
- $html = wp_oembed_get( $url, $attr );
-
- // Cache the result
- $cache = ( $html ) ? $html : '{{unknown}}';
- update_post_meta( $post_ID, $cachekey, $cache );
-
- // If there was a result, return it
- if ( $html )
- return apply_filters( 'embed_oembed_html', $html, $url, $attr, $post_ID );
- }
-
- // Still unknown
- return $this->maybe_make_link( $url );
- }
-
- /**
- * Delete all oEmbed caches.
- *
- * @param int $post_ID Post ID to delete the caches for.
- */
- function delete_oembed_caches( $post_ID ) {
- $post_metas = get_post_custom_keys( $post_ID );
- if ( empty($post_metas) )
- return;
-
- foreach( $post_metas as $post_meta_key ) {
- if ( '_oembed_' == substr( $post_meta_key, 0, 8 ) )
- delete_post_meta( $post_ID, $post_meta_key );
- }
- }
-
- /**
- * Triggers a caching of all oEmbed results.
- *
- * @param int $post_ID Post ID to do the caching for.
- */
- function cache_oembed( $post_ID ) {
- $post = get_post( $post_ID );
-
- if ( empty($post->ID) || !in_array( $post->post_type, apply_filters( 'embed_cache_oembed_types', array( 'post', 'page' ) ) ) )
- return;
-
- // Trigger a caching
- if ( !empty($post->post_content) ) {
- $this->post_ID = $post->ID;
- $this->usecache = false;
-
- $content = $this->run_shortcode( $post->post_content );
- $this->autoembed( $content );
-
- $this->usecache = true;
- }
- }
-
- /**
- * Passes any unlinked URLs that are on their own line to {@link WP_Embed::shortcode()} for potential embedding.
- *
- * @uses WP_Embed::autoembed_callback()
- *
- * @param string $content The content to be searched.
- * @return string Potentially modified $content.
- */
- function autoembed( $content ) {
- return preg_replace_callback( '|^\s*(https?://[^\s"]+)\s*$|im', array( $this, 'autoembed_callback' ), $content );
- }
-
- /**
- * Callback function for {@link WP_Embed::autoembed()}.
- *
- * @uses WP_Embed::shortcode()
- *
- * @param array $match A regex match array.
- * @return string The embed HTML on success, otherwise the original URL.
- */
- function autoembed_callback( $match ) {
- $oldval = $this->linkifunknown;
- $this->linkifunknown = false;
- $return = $this->shortcode( array(), $match[1] );
- $this->linkifunknown = $oldval;
-
- return "\n$return\n";
- }
-
- /**
- * Conditionally makes a hyperlink based on an internal class variable.
- *
- * @param string $url URL to potentially be linked.
- * @return string Linked URL or the original URL.
- */
- function maybe_make_link( $url ) {
- $output = ( $this->linkifunknown ) ? '<a href="' . esc_attr($url) . '">' . esc_html($url) . '</a>' : $url;
- return apply_filters( 'embed_maybe_make_link', $output, $url );
- }
-}
-$GLOBALS['wp_embed'] = new WP_Embed();
-
-/**
</del><span class="cx"> * Register an embed handler. This function should probably only be used for sites that do not support oEmbed.
</span><span class="cx"> *
</span><span class="cx"> * @since 2.9.0
</span></span></pre></div>
<a id="trunkwpsettingsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-settings.php (21998 => 21999)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-settings.php 2012-09-25 07:10:09 UTC (rev 21998)
+++ trunk/wp-settings.php 2012-09-25 08:39:26 UTC (rev 21999)
</span><span class="lines">@@ -134,6 +134,7 @@
</span><span class="cx"> require( ABSPATH . WPINC . '/update.php' );
</span><span class="cx"> require( ABSPATH . WPINC . '/canonical.php' );
</span><span class="cx"> require( ABSPATH . WPINC . '/shortcodes.php' );
</span><ins>+require( ABSPATH . WPINC . '/class-wp-embed.php' );
</ins><span class="cx"> require( ABSPATH . WPINC . '/media.php' );
</span><span class="cx"> require( ABSPATH . WPINC . '/http.php' );
</span><span class="cx"> require( ABSPATH . WPINC . '/class-http.php' );
</span></span></pre>
</div>
</div>
</body>
</html>