WordPress.org

Make WordPress Core


Ignore:
Timestamp:
07/22/2015 05:14:50 AM (5 years ago)
Author:
pento
Message:

Shortcodes: Improve the reliablity of shortcodes inside HTML tags.

Props miqrogroove.

See #15694.

File:
1 edited

Legend:

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

    r32545 r33359  
    6060
    6161        // Do the shortcode (only the [embed] one is registered)
    62         $content = do_shortcode( $content );
     62        $content = do_shortcode( $content, true );
    6363
    6464        // Put the original shortcodes back
     
    319319     */
    320320    public function autoembed( $content ) {
     321        // Strip newlines from all elements.
     322        $content = wp_replace_in_html_tags( $content, array( "\n" => " " ) );
     323
     324        // Find URLs that are on their own line.
    321325        return preg_replace_callback( '|^(\s*)(https?://[^\s"]+)(\s*)$|im', array( $this, 'autoembed_callback' ), $content );
    322326    }
Note: See TracChangeset for help on using the changeset viewer.