Make WordPress Core


Ignore:
Timestamp:
07/23/2015 04:36:55 AM (9 years ago)
Author:
pento
Message:

Shortcodes: Improve the reliablity of shortcodes inside HTML tags.

Merge of [33359] to the 4.1 branch.

Props miqrogroove.

See #15694.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/4.1/src/wp-includes/class-wp-embed.php

    r30681 r33380  
    5858
    5959        // Do the shortcode (only the [embed] one is registered)
    60         $content = do_shortcode( $content );
     60        $content = do_shortcode( $content, true );
    6161
    6262        // Put the original shortcodes back
     
    313313     */
    314314    public function autoembed( $content ) {
     315        // Strip newlines from all elements.
     316        $content = wp_replace_in_html_tags( $content, array( "\n" => " " ) );
     317
     318        // Find URLs that are on their own line.
    315319        return preg_replace_callback( '|^\s*(https?://[^\s"]+)\s*$|im', array( $this, 'autoembed_callback' ), $content );
    316320    }
Note: See TracChangeset for help on using the changeset viewer.