enmi-conf.org: comparison wp/wp-includes/shortcodes.php

equal deleted inserted replaced

-:346c88efed21
+:5e2f62d02dcd
 * and in the future may not be accurate. Please update the note when it is no
 * longer the case.}}
 *
 * To apply shortcode tags to content:
 *
-* <code>
+*     $out = do_shortcode( $content );
-* $out = do_shortcode($content);
+*
-* </code>
+* @link https://codex.wordpress.org/Shortcode_API
-*
-* @link http://codex.wordpress.org/Shortcode_API
 *
 * @package WordPress
 * @subpackage Shortcodes
-* @since 2.5
+* @since 2.5.0
 */
 /**
 * Container for storing shortcode tags and their hook to call for the shortcode
 *
-* @since 2.5
+* @since 2.5.0
+*
 * @name $shortcode_tags
 * @var array
 * @global array $shortcode_tags
 */
 $shortcode_tags = array();
 * plugin has a similar shortcode, it will override yours or yours will override
 * theirs depending on which order the plugins are included and/or ran.
 *
 * Simplest example of a shortcode tag using the API:
 *
-* <code>
+*     // [footag foo="bar"]
-* // [footag foo="bar"]
+*     function footag_func( $atts ) {
-* function footag_func($atts) {
+*         return "foo = {
-* 	return "foo = {$atts[foo]}";
+*             $atts[foo]
-* }
+*         }";
-* add_shortcode('footag', 'footag_func');
+*     }
-* </code>
+*     add_shortcode( 'footag', 'footag_func' );
 *
 * Example with nice attribute defaults:
 *
-* <code>
+*     // [bartag foo="bar"]
-* // [bartag foo="bar"]
+*     function bartag_func( $atts ) {
-* function bartag_func($atts) {
+*         $args = shortcode_atts( array(
-* 	extract(shortcode_atts(array(
+*             'foo' => 'no foo',
-* 		'foo' => 'no foo',
+*             'baz' => 'default baz',
-* 		'baz' => 'default baz',
+*         ), $atts );
-* 	), $atts));
+*
-*
+*         return "foo = {$args['foo']}";
-* 	return "foo = {$foo}";
+*     }
-* }
+*     add_shortcode( 'bartag', 'bartag_func' );
-* add_shortcode('bartag', 'bartag_func');
-* </code>
 *
 * Example with enclosed content:
 *
-* <code>
+*     // [baztag]content[/baztag]
-* // [baztag]content[/baztag]
+*     function baztag_func( $atts, $content = '' ) {
-* function baztag_func($atts, $content='') {
+*         return "content = $content";
-* 	return "content = $content";
+*     }
-* }
+*     add_shortcode( 'baztag', 'baztag_func' );
-* add_shortcode('baztag', 'baztag_func');
+*
-* </code>
+* @since 2.5.0
 *
-* @since 2.5
 * @uses $shortcode_tags
 *
 * @param string $tag Shortcode tag to be searched in post content.
 * @param callable $func Hook to run when shortcode is found.
 */
 }
 /**
 * Removes hook for shortcode.
 *
-* @since 2.5
+* @since 2.5.0
-* @uses $shortcode_tags
+*
-*
+* @uses $shortcode_tags
-* @param string $tag shortcode tag to remove hook for.
+*
+* @param string $tag Shortcode tag to remove hook for.
 */
 function remove_shortcode($tag) {
 	global $shortcode_tags;
 	unset($shortcode_tags[$tag]);
 *
 * This function is simple, it clears all of the shortcode tags by replacing the
 * shortcodes global by a empty array. This is actually a very efficient method
 * for removing all shortcodes.
 *
-* @since 2.5
+* @since 2.5.0
+*
 * @uses $shortcode_tags
 */
 function remove_all_shortcodes() {
 	global $shortcode_tags;
 /**
 * Whether a registered shortcode exists named $tag
 *
 * @since 3.6.0
 *
+* @global array $shortcode_tags List of shortcode tags and their callback hooks.
+*
+* @param string $tag Shortcode tag to check.
+* @return bool Whether the given shortcode exists.
+*/
+function shortcode_exists( $tag ) {
+	global $shortcode_tags;
+	return array_key_exists( $tag, $shortcode_tags );
+}
+/**
+* Whether the passed content contains the specified shortcode
+*
+* @since 3.6.0
+*
 * @global array $shortcode_tags
-* @param string $tag
+*
-* @return boolean
+* @param string $content Content to search for shortcodes.
-*/
+* @param string $tag     Shortcode tag to check.
-function shortcode_exists( $tag ) {
+* @return bool Whether the passed content contains the given shortcode.
-	global $shortcode_tags;
-	return array_key_exists( $tag, $shortcode_tags );
-}
-/**
-* Whether the passed content contains the specified shortcode
-*
-* @since 3.6.0
-*
-* @global array $shortcode_tags
-* @param string $tag
-* @return boolean
 */
 function has_shortcode( $content, $tag ) {
+	if ( false === strpos( $content, '[' ) ) {
+		return false;
+	}
 	if ( shortcode_exists( $tag ) ) {
 		preg_match_all( '/' . get_shortcode_regex() . '/s', $content, $matches, PREG_SET_ORDER );
 		if ( empty( $matches ) )
 			return false;
 		foreach ( $matches as $shortcode ) {
-			if ( $tag === $shortcode[2] )
+			if ( $tag === $shortcode[2] ) {
 				return true;
+			} elseif ( ! empty( $shortcode[5] ) && has_shortcode( $shortcode[5], $tag ) ) {
+				return true;
+			}
 		}
 	}
 	return false;
 }
 *
 * If there are no shortcode tags defined, then the content will be returned
 * without any filtering. This might cause issues when plugins are disabled but
 * the shortcode will still show up in the post or content.
 *
-* @since 2.5
+* @since 2.5.0
-* @uses $shortcode_tags
+*
-* @uses get_shortcode_regex() Gets the search pattern for searching shortcodes.
+* @global array $shortcode_tags List of shortcode tags and their callback hooks.
 *
-* @param string $content Content to search for shortcodes
+* @param string $content Content to search for shortcodes.
 * @return string Content with shortcodes filtered out.
 */
 function do_shortcode($content) {
 	global $shortcode_tags;
+	if ( false === strpos( $content, '[' ) ) {
+		return $content;
+	}
 	if (empty($shortcode_tags) || !is_array($shortcode_tags))
 		return $content;
 	$pattern = get_shortcode_regex();
 * 3 - The shortcode argument list
 * 4 - The self closing /
 * 5 - The content of a shortcode when it wraps some content.
 * 6 - An extra ] to allow for escaping shortcodes with double [[]]
 *
-* @since 2.5
+* @since 2.5.0
+*
 * @uses $shortcode_tags
 *
 * @return string The shortcode search regular expression
 */
 function get_shortcode_regex() {
 /**
 * Regular Expression callable for do_shortcode() for calling shortcode hook.
 * @see get_shortcode_regex for details of the match array contents.
 *
-* @since 2.5
+* @since 2.5.0
 * @access private
 * @uses $shortcode_tags
 *
 * @param array $m Regular expression match array
 * @return mixed False on failure.
 *
 * The attributes list has the attribute name as the key and the value of the
 * attribute as the value in the key/value pair. This allows for easier
 * retrieval of the attributes, since all attributes have to be known.
 *
-* @since 2.5
+* @since 2.5.0
 *
 * @param string $text
 * @return array List of attributes and their value.
 */
 function shortcode_parse_atts($text) {
 				$atts[strtolower($m[1])] = stripcslashes($m[2]);
 			elseif (!empty($m[3]))
 				$atts[strtolower($m[3])] = stripcslashes($m[4]);
 			elseif (!empty($m[5]))
 				$atts[strtolower($m[5])] = stripcslashes($m[6]);
-			elseif (isset($m[7]) and strlen($m[7]))
+			elseif (isset($m[7]) && strlen($m[7]))
 				$atts[] = stripcslashes($m[7]);
 			elseif (isset($m[8]))
 				$atts[] = stripcslashes($m[8]);
 		}
 	} else {
 * only contain the attributes in the $pairs list.
 *
 * If the $atts list has unsupported attributes, then they will be ignored and
 * removed from the final returned list.
 *
-* @since 2.5
+* @since 2.5.0
 *
 * @param array $pairs Entire list of supported attributes and their defaults.
 * @param array $atts User defined attributes in shortcode tag.
 * @param string $shortcode Optional. The name of the shortcode, provided for context to enable filtering
 * @return array Combined and filtered attribute list.
 }
 /**
 * Remove all shortcode tags from the given content.
 *
-* @since 2.5
+* @since 2.5.0
+*
 * @uses $shortcode_tags
 *
 * @param string $content Content to remove shortcode tags.
 * @return string Content without shortcode tags.
 */
 function strip_shortcodes( $content ) {
 	global $shortcode_tags;
+	if ( false === strpos( $content, '[' ) ) {
+		return $content;
+	}
 	if (empty($shortcode_tags) || !is_array($shortcode_tags))
 		return $content;
 	$pattern = get_shortcode_regex();
 		return substr($m[0], 1, -1);
 	}
 	return $m[1] . $m[6];
 }
-add_filter('the_content', 'do_shortcode', 11); // AFTER wpautop()

changeset 5	5e2f62d02dcd
parent 0	d970ebf37754
child 7	cf61fcea0001