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

Timestamp:

06/19/2015 09:32:31 PM (10 years ago)

Author:

wonderboymusic

Message:

Check is_callable() in do_shortcode_tag(), not add_shortcode().
Add a _doing_it_wrong() in do_shortcode_tag() when is_callable() is false.

Props aaroncampbell.
See #32445.

File:

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

trunk/src/wp-includes/shortcodes.php

@@ -89 +89 @@
 function add_shortcode($tag, $func) {
     global $shortcode_tags;
-
-    if ( is_callable($func) )
-        $shortcode_tags[$tag] = $func;
+    $shortcode_tags[ $tag ] = $func;
 }
 
@@ -283 +281 @@
     $attr = shortcode_parse_atts( $m[3] );
 
+    if ( ! is_callable( $shortcode_tags[ $tag ] ) ) {
+        $message = sprintf( __( 'Attempting to parse a shortcode without a valid callback: %s' ), $tag );
+        _doing_it_wrong( __FUNCTION__, $message, '4.3.0' );
+        return $m[0];
+    }
+
     if ( isset( $m[5] ) ) {
         // enclosing tag - extra parameter