X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/61343b82c4f0da4c68e4c6373daafff4a81efdd1..a7cd4c052013b423c6301153f68c7fdbaa2a447b:/wp-includes/shortcodes.php?ds=sidebyside
diff --git a/wp-includes/shortcodes.php b/wp-includes/shortcodes.php
index a4095949..99eec774 100644
--- a/wp-includes/shortcodes.php
+++ b/wp-includes/shortcodes.php
@@ -21,21 +21,20 @@
*
* To apply shortcode tags to content:
*
- *
- * $out = do_shortcode($content);
- *
+ * $out = do_shortcode( $content );
*
* @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
@@ -51,40 +50,37 @@ $shortcode_tags = array();
*
* Simplest example of a shortcode tag using the API:
*
- *
- * // [footag foo="bar"]
- * function footag_func($atts) {
- * return "foo = {$atts[foo]}";
- * }
- * add_shortcode('footag', 'footag_func');
- *
+ * // [footag foo="bar"]
+ * function footag_func( $atts ) {
+ * return "foo = {
+ * $atts[foo]
+ * }";
+ * }
+ * add_shortcode( 'footag', 'footag_func' );
*
* Example with nice attribute defaults:
*
- *
- * // [bartag foo="bar"]
- * function bartag_func($atts) {
- * extract(shortcode_atts(array(
- * 'foo' => 'no foo',
- * 'baz' => 'default baz',
- * ), $atts));
+ * // [bartag foo="bar"]
+ * function bartag_func( $atts ) {
+ * $args = shortcode_atts( array(
+ * 'foo' => 'no foo',
+ * 'baz' => 'default baz',
+ * ), $atts );
*
- * return "foo = {$foo}";
- * }
- * add_shortcode('bartag', 'bartag_func');
- *
+ * return "foo = {$args['foo']}";
+ * }
+ * add_shortcode( 'bartag', 'bartag_func' );
*
* Example with enclosed content:
*
- *
- * // [baztag]content[/baztag]
- * function baztag_func($atts, $content='') {
- * return "content = $content";
- * }
- * add_shortcode('baztag', 'baztag_func');
- *
+ * // [baztag]content[/baztag]
+ * function baztag_func( $atts, $content = '' ) {
+ * return "content = $content";
+ * }
+ * add_shortcode( 'baztag', 'baztag_func' );
+ *
+ * @since 2.5.0
*
- * @since 2.5
* @uses $shortcode_tags
*
* @param string $tag Shortcode tag to be searched in post content.
@@ -100,7 +96,8 @@ function add_shortcode($tag, $func) {
/**
* Removes hook for shortcode.
*
- * @since 2.5
+ * @since 2.5.0
+ *
* @uses $shortcode_tags
*
* @param string $tag shortcode tag to remove hook for.
@@ -118,7 +115,8 @@ function remove_shortcode($tag) {
* 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() {
@@ -151,14 +149,21 @@ function shortcode_exists( $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;
@@ -171,9 +176,9 @@ function has_shortcode( $content, $tag ) {
* 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.
*
* @param string $content Content to search for shortcodes
* @return string Content with shortcodes filtered out.
@@ -181,6 +186,10 @@ function has_shortcode( $content, $tag ) {
function do_shortcode($content) {
global $shortcode_tags;
+ if ( false === strpos( $content, '[' ) ) {
+ return $content;
+ }
+
if (empty($shortcode_tags) || !is_array($shortcode_tags))
return $content;
@@ -203,7 +212,8 @@ function do_shortcode($content) {
* 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
@@ -250,7 +260,7 @@ 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
*
@@ -284,7 +294,7 @@ function do_shortcode_tag( $m ) {
* 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.
@@ -322,7 +332,7 @@ function shortcode_parse_atts($text) {
* 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.
@@ -338,7 +348,18 @@ function shortcode_atts( $pairs, $atts, $shortcode = '' ) {
else
$out[$name] = $default;
}
-
+ /**
+ * Filter a shortcode's default attributes.
+ *
+ * If the third parameter of the shortcode_atts() function is present then this filter is available.
+ * The third parameter, $shortcode, is the name of the shortcode.
+ *
+ * @since 3.6.0
+ *
+ * @param array $out The output array of shortcode attributes.
+ * @param array $pairs The supported attributes and their defaults.
+ * @param array $atts The user defined shortcode attributes.
+ */
if ( $shortcode )
$out = apply_filters( "shortcode_atts_{$shortcode}", $out, $pairs, $atts );
@@ -348,7 +369,8 @@ function shortcode_atts( $pairs, $atts, $shortcode = '' ) {
/**
* 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.
@@ -357,6 +379,10 @@ function shortcode_atts( $pairs, $atts, $shortcode = '' ) {
function strip_shortcodes( $content ) {
global $shortcode_tags;
+ if ( false === strpos( $content, '[' ) ) {
+ return $content;
+ }
+
if (empty($shortcode_tags) || !is_array($shortcode_tags))
return $content;