Changeset 2443

Timestamp:

03/14/2005 01:02:04 AM (22 years ago)

Author:

ryan

Message:

Apply filters to auto excerpt before tags are stripped. ​http://mosquito.wordpress.org/view.php?id=918 Props: kim

Location:

trunk

Files:

• wp-content/plugins/markdown.php (modified) (1 diff)
• wp-includes/functions-formatting.php (modified) (1 diff)

trunk/wp-content/plugins/markdown.php

@@ -46 +46 @@
         add_filter('the_content', 'Markdown', 6);
         add_filter('the_excerpt', 'Markdown', 6);
+        add_filter('the_excerpt_rss', 'Markdown', 6);
         add_filter('comment_text', 'Markdown', 6);
 }

trunk/wp-includes/functions-formatting.php

@@ -643 +643 @@
 }
 
-function wp_trim_excerpt( $text ) { // Fakes an excerpt if needed
+function wp_trim_excerpt($text) { // Fakes an excerpt if needed
         global $post;
         if ( '' == $text ) {
                 $text = $post->post_content;
-                $text = strip_tags( $text );
-                $blah = explode(' ', $text);
+                $text = apply_filters('the_content', $text);
+                $text = str_replace(']]>', ']]>', $text);
+                $text = strip_tags($text);
                 $excerpt_length = 55;
-                if (count($blah) > $excerpt_length) {
-                $k = $excerpt_length;
-                $use_dotdotdot = 1;
-                } else {
-                $k = count($blah);
-                $use_dotdotdot = 0;
-                }
-                $excerpt = '';
-                for ($i=0; $i<$k; $i++) {
-                $excerpt .= $blah[$i].' ';
-                }
-                $excerpt .= ($use_dotdotdot) ? '[...]' : '';
-                $text = $excerpt;
-        } // end if no excerpt
+                $words = explode(' ', $text, $excerpt_length + 1);
+                if (count($words) > $excerpt_length) {
+                        array_pop($words);
+                        array_push($words, '[...]');
+                        $text = implode(' ', $words);
+                }
+        }
         return $text;
 }