Changeset 42343 for trunk/src/wp-includes/shortcodes.php

Timestamp:

11/30/2017 11:09:33 PM (7 years ago)

Author:

pento

Message:

Code is Poetry.
WordPress' code just... wasn't.
This is now dealt with.

Props jrf, pento, netweb, GaryJ, jdgrimes, westonruter, Greg Sherwood from PHPCS, and everyone who's ever contributed to WPCS and PHPCS.
Fixes #41057.

File:

• trunk/src/wp-includes/shortcodes.php (modified) (16 diffs)

trunk/src/wp-includes/shortcodes.php

@@ -89 +89 @@
  * @param string $tag Shortcode tag to remove hook for.
  */
-function remove_shortcode($tag) {
-    global $shortcode_tags;
-
-    unset($shortcode_tags[$tag]);
+function remove_shortcode( $tag ) {
+    global $shortcode_tags;
+
+    unset( $shortcode_tags[ $tag ] );
 }
 
@@ -145 +145 @@
     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 ) {
@@ -181 +182 @@
     }
 
-    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.
@@ -232 +234 @@
         $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()
@@ -272 +274 @@
 /**
  * Regular Expression callable for do_shortcode() for calling shortcode hook.
+ *
  * @see get_shortcode_regex for details of the match array contents.
  *
@@ -287 +290 @@
     // allow [[foo]] syntax for escaping a tag
     if ( $m[1] == '[' && $m[6] == ']' ) {
-        return substr($m[0], 1, -1);
-    }
-
-    $tag = $m[2];
+        return substr( $m[0], 1, -1 );
+    }
+
+    $tag  = $m[2];
     $attr = shortcode_parse_atts( $m[3] );
 
@@ -352 +355 @@
 function do_shortcodes_in_html_tags( $content, $ignore_html, $tagnames ) {
     // Normalize entities in unfiltered HTML before adding placeholders.
-    $trans = array( '[' => '[', ']' => ']' );
+    $trans   = array(
+        '[' => '[',
+        ']' => ']',
+    );
     $content = strtr( $content, $trans );
-    $trans = array( '[' => '[', ']' => ']' );
+    $trans   = array(
+        '[' => '[',
+        ']' => ']',
+    );
 
     $pattern = get_shortcode_regex( $tagnames );
@@ -364 +373 @@
         }
 
-        $noopen = false === strpos( $element, '[' );
+        $noopen  = false === strpos( $element, '[' );
         $noclose = false === strpos( $element, ']' );
         if ( $noopen || $noclose ) {
@@ -394 +403 @@
 
         // Get element name
-        $front = array_shift( $attributes );
-        $back = array_pop( $attributes );
+        $front   = array_shift( $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 ) {
@@ -418 +427 @@
                 // $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 ) {
@@ -450 +459 @@
  */
 function unescape_invalid_shortcodes( $content ) {
-        // Clean up entire string, avoids re-parsing HTML.
-        $trans = array( '[' => '[', ']' => ']' );
-        $content = strtr( $content, $trans );
-
-        return $content;
+        // Clean up entire string, avoids re-parsing HTML.
+        $trans   = array(
+            '[' => '[',
+            ']' => ']',
+        );
+        $content = strtr( $content, $trans );
+
+        return $content;
 }
 
@@ -483 +495 @@
  *                      All other matches are checked for not empty().
  */
-function shortcode_parse_atts($text) {
-    $atts = array();
+function shortcode_parse_atts( $text ) {
+    $atts    = array();
     $pattern = get_shortcode_atts_regex();
-    $text = preg_replace("/[\x{00a0}\x{200b}]+/u", " ", $text);
-    if ( preg_match_all($pattern, $text, $match, PREG_SET_ORDER) ) {
-        foreach ($match as $m) {
-            if (!empty($m[1]))
-                $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]) && strlen($m[7]))
-                $atts[] = stripcslashes($m[7]);
-            elseif (isset($m[8]) && strlen($m[8]))
-                $atts[] = stripcslashes($m[8]);
-            elseif (isset($m[9]))
-                $atts[] = stripcslashes($m[9]);
+    $text    = preg_replace( "/[\x{00a0}\x{200b}]+/u", ' ', $text );
+    if ( preg_match_all( $pattern, $text, $match, PREG_SET_ORDER ) ) {
+        foreach ( $match as $m ) {
+            if ( ! empty( $m[1] ) ) {
+                $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] ) && strlen( $m[7] ) ) {
+                $atts[] = stripcslashes( $m[7] );
+            } elseif ( isset( $m[8] ) && strlen( $m[8] ) ) {
+                $atts[] = stripcslashes( $m[8] );
+            } elseif ( isset( $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 ) ) {
@@ -512 +525 @@
         }
     } else {
-        $atts = ltrim($text);
+        $atts = ltrim( $text );
     }
     return $atts;
@@ -535 +548 @@
  */
 function shortcode_atts( $pairs, $atts, $shortcode = '' ) {
-    $atts = (array)$atts;
-    $out = array();
-    foreach ($pairs as $name => $default) {
-        if ( array_key_exists($name, $atts) )
-            $out[$name] = $atts[$name];
-        else
-            $out[$name] = $default;
+    $atts = (array) $atts;
+    $out  = array();
+    foreach ( $pairs as $name => $default ) {
+        if ( array_key_exists( $name, $atts ) ) {
+            $out[ $name ] = $atts[ $name ];
+        } else {
+            $out[ $name ] = $default;
+        }
     }
     /**
@@ -581 +595 @@
     }
 
-    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.
@@ -627 +642 @@
     // allow [[foo]] syntax for escaping a tag
     if ( $m[1] == '[' && $m[6] == ']' ) {
-        return substr($m[0], 1, -1);
+        return substr( $m[0], 1, -1 );
     }