public $post_ID;
public $usecache = true;
public $linkifunknown = true;
+ public $last_attr = array();
+ public $last_url = '';
/**
- * When an URL cannot be embedded, return false instead of returning a link
+ * When a URL cannot be embedded, return false instead of returning a link
* or the URL. Bypasses the 'embed_maybe_make_link' filter.
*/
public $return_false_on_fail = false;
// After a post is saved, cache oEmbed items via AJAX
add_action( 'edit_form_advanced', array( $this, 'maybe_run_ajax_cache' ) );
+ add_action( 'edit_page_form', array( $this, 'maybe_run_ajax_cache' ) );
}
/**
* 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()
+ * @global array $shortcode_tags
*
* @param string $content Content to parse
* @return string Content with shortcode parsed
add_shortcode( 'embed', array( $this, 'shortcode' ) );
// Do the shortcode (only the [embed] one is registered)
- $content = do_shortcode( $content );
+ $content = do_shortcode( $content, true );
// Put the original shortcodes back
$shortcode_tags = $orig_shortcode_tags;
?>
<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
}
*
* @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 callable $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.
*/
public function register_handler( $id, $regex, $callback, $priority = 10 ) {
* @param int $priority Optional. The priority of the handler to be removed (default: 10).
*/
public function unregister_handler( $id, $priority = 10 ) {
- if ( isset($this->handlers[$priority][$id]) )
- unset($this->handlers[$priority][$id]);
+ unset( $this->handlers[ $priority ][ $id ] );
}
/**
* 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. Optional.
*
* @type int $height Height of the embed in pixels.
* }
* @param string $url The URL attempting to be embedded.
- * @return string The embed HTML on success, otherwise the original URL.
+ * @return string|false The embed HTML on success, otherwise the original URL.
+ * `->maybe_make_link()` can return false on failure.
*/
public function shortcode( $attr, $url = '' ) {
$post = get_post();
$url = $attr['src'];
}
- if ( empty( $url ) )
+ $this->last_url = $url;
+
+ if ( empty( $url ) ) {
+ $this->last_attr = $attr;
return '';
+ }
$rawattr = $attr;
$attr = wp_parse_args( $attr, wp_embed_defaults( $url ) );
+ $this->last_attr = $attr;
+
// kses converts & into & and we need to undo this
- // See http://core.trac.wordpress.org/ticket/11311
+ // See https://core.trac.wordpress.org/ticket/11311
$url = str_replace( '&', '&', $url );
// Look for known internal handlers
}
/**
- * Filter whether to inspect the given URL for discoverable <link> tags.
+ * Filter whether to inspect the given URL for discoverable link tags.
*
* @since 2.9.0
+ * @since 4.4.0 The default value changed to true.
*
* @see WP_oEmbed::discover()
*
- * @param bool $enable Whether to enable <link> tag discovery. Default false.
+ * @param bool $enable Whether to enable `<link>` tag discovery. Default true.
*/
- $attr['discover'] = ( apply_filters( 'embed_oembed_discover', false ) && author_can( $post_ID, 'unfiltered_html' ) );
+ $attr['discover'] = ( apply_filters( 'embed_oembed_discover', true ) );
// Use oEmbed to get the HTML
$html = wp_oembed_get( $url, $attr );
if ( empty($post_metas) )
return;
- foreach( $post_metas as $post_meta_key ) {
+ foreach ( $post_metas as $post_meta_key ) {
if ( '_oembed_' == substr( $post_meta_key, 0, 8 ) )
delete_post_meta( $post_ID, $post_meta_key );
}
* @return string Potentially modified $content.
*/
public function autoembed( $content ) {
- return preg_replace_callback( '|^\s*(https?://[^\s"]+)\s*$|im', array( $this, 'autoembed_callback' ), $content );
+ // Replace line breaks from all HTML elements with placeholders.
+ $content = wp_replace_in_html_tags( $content, array( "\n" => '<!-- wp-line-break -->' ) );
+
+ // Find URLs that are on their own line.
+ $content = preg_replace_callback( '|^(\s*)(https?://[^\s"]+)(\s*)$|im', array( $this, 'autoembed_callback' ), $content );
+
+ // Put the line breaks back.
+ return str_replace( '<!-- wp-line-break -->', "\n", $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.
*/
public function autoembed_callback( $match ) {
$oldval = $this->linkifunknown;
$this->linkifunknown = false;
- $return = $this->shortcode( array(), $match[1] );
+ $return = $this->shortcode( array(), $match[2] );
$this->linkifunknown = $oldval;
- return "\n$return\n";
+ return $match[1] . $return . $match[3];
}
/**
* 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.
+ * @return false|string Linked URL or the original URL. False if 'return_false_on_fail' is true.
*/
public function maybe_make_link( $url ) {
if ( $this->return_false_on_fail ) {
scripts.mit.edu / autoinstalls / wordpress.git / blobdiff