Make WordPress Core

Changeset 33568 for branches/3.7/src


Ignore:
Timestamp:
08/04/2015 07:18:50 AM (9 years ago)
Author:
dd32
Message:

Fix do_shortcode('<[shortcode]') edge case.
Props miqrogroove.

Merges [33499] to the 3.7 branch.
See #33116.

Location:
branches/3.7
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/3.7

  • branches/3.7/src

  • branches/3.7/src/wp-includes/shortcodes.php

    r33525 r33568  
    346346        $attributes = wp_kses_attr_parse( $element );
    347347        if ( false === $attributes ) {
     348            // Some plugins are doing things like [name] <[email]>.
     349            if ( 1 === preg_match( '%^<\s*\[\[?[^\[\]]+\]%', $element ) ) {
     350                $element = preg_replace_callback( "/$pattern/s", 'do_shortcode_tag', $element );
     351            }
     352
    348353            // Looks like we found some crazy unfiltered HTML.  Skipping it for sanity.
    349354            $element = strtr( $element, $trans );
Note: See TracChangeset for help on using the changeset viewer.