Changeset 7814

Timestamp:

04/25/2008 12:43:44 AM (18 years ago)

Author:

markjaquith

Message:

Revert [7700] from trunk in preparation for a different #6444 solution

Location:

trunk/wp-includes

Files:

• formatting.php (modified) (3 diffs)
• media.php (modified) (4 diffs)
• shortcodes.php (modified) (5 diffs)

trunk/wp-includes/formatting.php

@@ -27 +27 @@
         $curl = $textarr[$i];
 
-        if (isset($curl{0}) && '<' != $curl{0} && '[' != $curl{0} && $next) { // If it's not a tag or shortcode
+        if (isset($curl{0}) && '<' != $curl{0} && '[' != $curl{0} && $next) { // If it's not a tag
             // static strings
             $curl = str_replace($static_characters, $static_replacements, $curl);
@@ -75 +75 @@
     $pee = preg_replace('/\n?(.+?)(?:\n\s*\n|\z)/s', "<p>$1</p>\n", $pee); // make paragraphs, including one at the end
     $pee = preg_replace('|<p>\s*?</p>|', '', $pee); // under certain strange conditions it could create a P of entirely whitespace
-    $pee = preg_replace('/<p>(\s*?' . get_shortcode_regex(true) . '\s*)<\/p>/s', '$1', $pee); // don't auto-p wrap post-formatting shortcodes
     $pee = preg_replace('!<p>([^<]+)\s*?(</(?:div|address|form)[^>]*>)!', "<p>$1</p>$2", $pee);
     $pee = preg_replace( '|<p>|', "$1<p>", $pee );
@@ -842 +841 @@
         $text = apply_filters('the_content', $text);
         $text = str_replace(']]>', ']]&gt;', $text);
-        $text = preg_replace('|//\s*<!\[CDATA\[|', '<![CDATA[', $text);
         $text = strip_tags($text);
         $excerpt_length = 55;

trunk/wp-includes/media.php

@@ -288 +288 @@
     if ( is_array($size) || empty($size) || empty($imagedata['sizes'][$size]) )
         return false;
-
+        
     $data = $imagedata['sizes'][$size];
     // include the full filesystem path of the intermediate file
@@ -302 +302 @@
 // returns an array (url, width, height), or false if no image is available
 function wp_get_attachment_image_src($attachment_id, $size='thumbnail', $icon = false) {
-
+    
     // get a thumbnail or intermediate image if there is one
     if ( $image = image_downsize($attachment_id, $size) )
@@ -329 +329 @@
         $html = '<img src="'.attribute_escape($src).'" '.$hwstring.'class="attachment-'.attribute_escape($size).'" alt="" />';
     }
-
+    
     return $html;
 }
 
-add_shortcode('gallery', 'gallery_shortcode', true);
+add_shortcode('gallery', 'gallery_shortcode');
 
 function gallery_shortcode($attr) {
@@ -378 +378 @@
     $columns = intval($columns);
     $itemwidth = $columns > 0 ? floor(100/$columns) : 100;
-
+    
     $output = apply_filters('gallery_style', "
         <style type='text/css'>

trunk/wp-includes/shortcodes.php

@@ -48 +48 @@
 $shortcode_tags = array();
 
-function add_shortcode($tag, $func, $after_formatting = false) {
+function add_shortcode($tag, $func) {
     global $shortcode_tags;
 
-    if ( is_callable($func) ) {
-        $shortcode_tags[($after_formatting)? 11:9][$tag] = $func;
-    }
+    if ( is_callable($func) )
+        $shortcode_tags[$tag] = $func;
 }
 
@@ -59 +58 @@
     global $shortcode_tags;
 
-    unset($shortcode_tags[9][$tag], $shortcode_tags[11][$tag]);
+    unset($shortcode_tags[$tag]);
 }
 
@@ -68 +67 @@
 }
 
-function do_shortcode_after_formatting($content) {
-    return do_shortcode($content, true);
-}
-function do_shortcode($content, $after_formatting = false) {
-    $pattern = get_shortcode_regex($after_formatting);
-    if (!$pattern) {
-        return $content;
-    } else {
-        $callback_func = 'do_shortcode_tag';
-        if ($after_formatting)
-           $callback_func .= '_after_formatting';
-
-        return preg_replace_callback('/' . $pattern . '/s', $callback_func, $content);
-    }
-}
-function get_shortcode_regex($after_formatting) {
+function do_shortcode($content) {
     global $shortcode_tags;
 
-    if (empty($shortcode_tags[($after_formatting)? 11:9]) || !is_array($shortcode_tags[($after_formatting)? 11:9]))
-        return false;
+    if (empty($shortcode_tags) || !is_array($shortcode_tags))
+        return $content;
 
-    $tagnames = array_keys($shortcode_tags[($after_formatting)? 11:9]);
+    $tagnames = array_keys($shortcode_tags);
     $tagregexp = join( '|', array_map('preg_quote', $tagnames) );
 
-    return '\[('.$tagregexp.')\b(.*?)(?:(\/))?\](?:(.+?)\[\/\1\])?';
+    $pattern = '/\[('.$tagregexp.')\b(.*?)(?:(\/))?\](?:(.+?)\[\/\1\])?/s';
+
+    return preg_replace_callback($pattern, 'do_shortcode_tag', $content);
 }
 
-function do_shortcode_tag_after_formatting($m) {
-    return do_shortcode_tag($m, true);
-}
-function do_shortcode_tag($m, $after_formatting = false) {
+function do_shortcode_tag($m) {
     global $shortcode_tags;
 
@@ -106 +89 @@
     if ( isset($m[4]) ) {
         // enclosing tag - extra parameter
-        return call_user_func($shortcode_tags[($after_formatting)? 11:9][$tag], $attr, $m[4]);
+        return call_user_func($shortcode_tags[$tag], $attr, $m[4]);
     } else {
         // self-closing tag
-        return call_user_func($shortcode_tags[($after_formatting)? 11:9][$tag], $attr);
+        return call_user_func($shortcode_tags[$tag], $attr);
     }
 }
@@ -148 +131 @@
 }
 
-add_filter( 'the_content', 'do_shortcode', 9 );
-add_filter( 'the_content', 'do_shortcode_after_formatting', 11 );
+add_filter('the_content', 'do_shortcode', 11); // AFTER wpautop() 
 
 ?>