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

equal deleted inserted replaced

-:c7c34916027a
+:177826044cd9
 *
 * @global array $shortcode_tags
 *
 * @param string $tag Shortcode tag to remove hook for.
 */
-function remove_shortcode($tag) {
+function remove_shortcode( $tag ) {
 	global $shortcode_tags;
-	unset($shortcode_tags[$tag]);
+	unset( $shortcode_tags[ $tag ] );
 }
 /**
 * Clear all shortcodes.
 *
 		return false;
 	}
 	if ( shortcode_exists( $tag ) ) {
 		preg_match_all( '/' . get_shortcode_regex() . '/', $content, $matches, PREG_SET_ORDER );
-		if ( empty( $matches ) )
+		if ( empty( $matches ) ) {
 			return false;
+		}
 		foreach ( $matches as $shortcode ) {
 			if ( $tag === $shortcode[2] ) {
 				return true;
 			} elseif ( ! empty( $shortcode[5] ) && has_shortcode( $shortcode[5], $tag ) ) {
 	if ( false === strpos( $content, '[' ) ) {
 		return $content;
 	}
-	if (empty($shortcode_tags) || !is_array($shortcode_tags))
+	if ( empty( $shortcode_tags ) || ! is_array( $shortcode_tags ) ) {
 		return $content;
+	}
 	// Find all registered tag names in $content.
 	preg_match_all( '@\[([^<>&/\[\]\x00-\x20=]++)@', $content, $matches );
 	$tagnames = array_intersect( array_keys( $shortcode_tags ), $matches[1] );
 	global $shortcode_tags;
 	if ( empty( $tagnames ) ) {
 		$tagnames = array_keys( $shortcode_tags );
 	}
-	$tagregexp = join( '|', array_map('preg_quote', $tagnames) );
+	$tagregexp = join( '|', array_map( 'preg_quote', $tagnames ) );
 	// WARNING! Do not change this regex without changing do_shortcode_tag() and strip_shortcode_tag()
 	// Also, see shortcode_unautop() and shortcode.js.
+	// phpcs:disable Squiz.Strings.ConcatenationSpacing.PaddingFound -- don't remove regex indentation
 	return
-		  '\\['                              // Opening bracket
+		'\\['                                // Opening bracket
 		. '(\\[?)'                           // 1: Optional second opening bracket for escaping shortcodes: [[tag]]
 		. "($tagregexp)"                     // 2: Shortcode name
 		. '(?![\\w-])'                       // Not followed by word character or hyphen
 		. '('                                // 3: Unroll the loop: Inside the opening shortcode tag
 		.     '[^\\]\\/]*'                   // Not a closing bracket or forward slash
 		.         ')'
 		.         '\\[\\/\\2\\]'             // Closing shortcode tag
 		.     ')?'
 		. ')'
 		. '(\\]?)';                          // 6: Optional second closing brocket for escaping shortcodes: [[tag]]
+	// phpcs:enable
 }
 /**
 * Regular Expression callable for do_shortcode() for calling shortcode hook.
+*
 * @see get_shortcode_regex for details of the match array contents.
 *
 * @since 2.5.0
 * @access private
 *
 function do_shortcode_tag( $m ) {
 	global $shortcode_tags;
 	// allow [[foo]] syntax for escaping a tag
 	if ( $m[1] == '[' && $m[6] == ']' ) {
-		return substr($m[0], 1, -1);
+		return substr( $m[0], 1, -1 );
 	}
-	$tag = $m[2];
+	$tag  = $m[2];
 	$attr = shortcode_parse_atts( $m[3] );
 	if ( ! is_callable( $shortcode_tags[ $tag ] ) ) {
 		/* translators: %s: shortcode tag */
 		$message = sprintf( __( 'Attempting to parse a shortcode without a valid callback: %s' ), $tag );
 * @param array $tagnames List of shortcodes to find.
 * @return string Content with shortcodes filtered out.
 */
 function do_shortcodes_in_html_tags( $content, $ignore_html, $tagnames ) {
 	// Normalize entities in unfiltered HTML before adding placeholders.
-	$trans = array( '&#91;' => '&#091;', '&#93;' => '&#093;' );
+	$trans   = array(
+		'&#91;' => '&#091;',
+		'&#93;' => '&#093;',
+	);
 	$content = strtr( $content, $trans );
-	$trans = array( '[' => '&#91;', ']' => '&#93;' );
+	$trans   = array(
+		'[' => '&#91;',
+		']' => '&#93;',
+	);
 	$pattern = get_shortcode_regex( $tagnames );
 	$textarr = wp_html_split( $content );
 	foreach ( $textarr as &$element ) {
 		if ( '' == $element || '<' !== $element[0] ) {
 			continue;
 		}
-		$noopen = false === strpos( $element, '[' );
+		$noopen  = false === strpos( $element, '[' );
 		$noclose = false === strpos( $element, ']' );
 		if ( $noopen || $noclose ) {
 			// This element does not contain shortcodes.
 			if ( $noopen xor $noclose ) {
 				// Need to encode stray [ or ] chars.
 			$element = strtr( $element, $trans );
 			continue;
 		}
 		// Get element name
-		$front = array_shift( $attributes );
+		$front   = array_shift( $attributes );
-		$back = array_pop( $attributes );
+		$back    = array_pop( $attributes );
 		$matches = array();
-		preg_match('%[a-zA-Z0-9]+%', $front, $matches);
+		preg_match( '%[a-zA-Z0-9]+%', $front, $matches );
 		$elname = $matches[0];
 		// Look for shortcodes in each attribute separately.
 		foreach ( $attributes as &$attr ) {
-			$open = strpos( $attr, '[' );
+			$open  = strpos( $attr, '[' );
 			$close = strpos( $attr, ']' );
 			if ( false === $open || false === $close ) {
 				continue; // Go to next attribute.  Square braces will be escaped at end of loop.
 			}
 			$double = strpos( $attr, '"' );
 				// and we do not need to run KSES here.
 				$attr = preg_replace_callback( "/$pattern/", 'do_shortcode_tag', $attr );
 			} else {
 				// $attr like 'name = "[shortcode]"' or "name = '[shortcode]'"
 				// We do not know if $content was unfiltered. Assume KSES ran before shortcodes.
-				$count = 0;
+				$count    = 0;
 				$new_attr = preg_replace_callback( "/$pattern/", 'do_shortcode_tag', $attr, -1, $count );
 				if ( $count > 0 ) {
 					// Sanitize the shortcode output using KSES.
 					$new_attr = wp_kses_one_attr( $new_attr, $elname );
 					if ( '' !== trim( $new_attr ) ) {
 *
 * @param string $content Content to search for placeholders.
 * @return string Content with placeholders removed.
 */
 function unescape_invalid_shortcodes( $content ) {
-// Clean up entire string, avoids re-parsing HTML.
+	// Clean up entire string, avoids re-parsing HTML.
-$trans = array( '&#91;' => '[', '&#93;' => ']' );
+	$trans = array(
-$content = strtr( $content, $trans );
+		'&#91;' => '[',
+		'&#93;' => ']',
-return $content;
+	);
+	$content = strtr( $content, $trans );
+	return $content;
 }
 /**
 * Retrieve the shortcode attributes regex.
 *
 * @return array|string List of attribute values.
 *                      Returns empty array if trim( $text ) == '""'.
 *                      Returns empty string if trim( $text ) == ''.
 *                      All other matches are checked for not empty().
 */
-function shortcode_parse_atts($text) {
+function shortcode_parse_atts( $text ) {
-	$atts = array();
+	$atts    = array();
 	$pattern = get_shortcode_atts_regex();
-	$text = preg_replace("/[\x{00a0}\x{200b}]+/u", " ", $text);
+	$text    = preg_replace( "/[\x{00a0}\x{200b}]+/u", ' ', $text );
-	if ( preg_match_all($pattern, $text, $match, PREG_SET_ORDER) ) {
+	if ( preg_match_all( $pattern, $text, $match, PREG_SET_ORDER ) ) {
-		foreach ($match as $m) {
+		foreach ( $match as $m ) {
-			if (!empty($m[1]))
+			if ( ! empty( $m[1] ) ) {
-				$atts[strtolower($m[1])] = stripcslashes($m[2]);
+				$atts[ strtolower( $m[1] ) ] = stripcslashes( $m[2] );
-			elseif (!empty($m[3]))
+			} elseif ( ! empty( $m[3] ) ) {
-				$atts[strtolower($m[3])] = stripcslashes($m[4]);
+				$atts[ strtolower( $m[3] ) ] = stripcslashes( $m[4] );
-			elseif (!empty($m[5]))
+			} elseif ( ! empty( $m[5] ) ) {
-				$atts[strtolower($m[5])] = stripcslashes($m[6]);
+				$atts[ strtolower( $m[5] ) ] = stripcslashes( $m[6] );
-			elseif (isset($m[7]) && strlen($m[7]))
+			} elseif ( isset( $m[7] ) && strlen( $m[7] ) ) {
-				$atts[] = stripcslashes($m[7]);
+				$atts[] = stripcslashes( $m[7] );
-			elseif (isset($m[8]) && strlen($m[8]))
+			} elseif ( isset( $m[8] ) && strlen( $m[8] ) ) {
-				$atts[] = stripcslashes($m[8]);
+				$atts[] = stripcslashes( $m[8] );
-			elseif (isset($m[9]))
+			} elseif ( isset( $m[9] ) ) {
-				$atts[] = stripcslashes($m[9]);
+				$atts[] = stripcslashes( $m[9] );
+			}
 		}
 		// Reject any unclosed HTML elements
-		foreach( $atts as &$value ) {
+		foreach ( $atts as &$value ) {
 			if ( false !== strpos( $value, '<' ) ) {
 				if ( 1 !== preg_match( '/^[^<]*+(?:<[^>]*+>[^<]*+)*+$/', $value ) ) {
 					$value = '';
 				}
 			}
 		}
 	} else {
-		$atts = ltrim($text);
+		$atts = ltrim( $text );
 	}
 	return $atts;
 }
 /**
 * @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.
 */
 function shortcode_atts( $pairs, $atts, $shortcode = '' ) {
-	$atts = (array)$atts;
+	$atts = (array) $atts;
-	$out = array();
+	$out  = array();
-	foreach ($pairs as $name => $default) {
+	foreach ( $pairs as $name => $default ) {
-		if ( array_key_exists($name, $atts) )
+		if ( array_key_exists( $name, $atts ) ) {
-			$out[$name] = $atts[$name];
+			$out[ $name ] = $atts[ $name ];
-		else
+		} else {
-			$out[$name] = $default;
+			$out[ $name ] = $default;
+		}
 	}
 	/**
 	 * Filters a shortcode's default attributes.
 	 *
 	 * If the third parameter of the shortcode_atts() function is present then this filter is available.
 	if ( false === strpos( $content, '[' ) ) {
 		return $content;
 	}
-	if (empty($shortcode_tags) || !is_array($shortcode_tags))
+	if ( empty( $shortcode_tags ) || ! is_array( $shortcode_tags ) ) {
 		return $content;
+	}
 	// Find all registered tag names in $content.
 	preg_match_all( '@\[([^<>&/\[\]\x00-\x20=]++)@', $content, $matches );
 	$tags_to_remove = array_keys( $shortcode_tags );
 	/**
 	 * Filters the list of shortcode tags to remove from the content.
 	 *
 	 * @since 4.7.0
 	 *
-	 * @param array  $tag_array Array of shortcode tags to remove.
+	 * @param array  $tags_to_remove Array of shortcode tags to remove.
-	 * @param string $content   Content shortcodes are being removed from.
+	 * @param string $content        Content shortcodes are being removed from.
 	 */
 	$tags_to_remove = apply_filters( 'strip_shortcodes_tagnames', $tags_to_remove, $content );
 	$tagnames = array_intersect( $tags_to_remove, $matches[1] );
 * @return string|false The content stripped of the tag, otherwise false.
 */
 function strip_shortcode_tag( $m ) {
 	// allow [[foo]] syntax for escaping a tag
 	if ( $m[1] == '[' && $m[6] == ']' ) {
-		return substr($m[0], 1, -1);
+		return substr( $m[0], 1, -1 );
 	}
 	return $m[1] . $m[6];
 }

changeset 9	177826044cd9
parent 7	cf61fcea0001
child 16	a86126ab1dd4