Changeset 2341

Timestamp:

02/15/2005 12:21:21 AM (20 years ago)

Author:

saxmatt

Message:

Make excerpt stuff a filter

Location:

trunk/wp-includes

Files:

• default-filters.php (modified) (1 diff)
• functions-formatting.php (modified) (1 diff)
• template-functions-post.php (modified) (1 diff)

trunk/wp-includes/default-filters.php

@@ -72 +72 @@
 add_filter('the_excerpt', 'wpautop');
 
+add_filter('get_the_excerpt', 'wp_trim_excerpt');
+
 add_filter('sanitize_title', 'sanitize_title_with_dashes');
 

trunk/wp-includes/functions-formatting.php

@@ -643 +643 @@
 }
 
+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);
+        $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
+    return $text;
+}
+
 ?>

trunk/wp-includes/template-functions-post.php

@@ -105 +105 @@
 
 function the_excerpt() {
-    echo apply_filters('the_excerpt', get_the_excerpt());
+    echo apply_filters('the_excerpt', get_the_excerpt());
 }
 
 function get_the_excerpt($fakeit = true) {
-    global $id, $post;
-    $output = '';
-    $output = $post->post_excerpt;
-    if (!empty($post->post_password)) { // if there's a password
-        if ($_COOKIE['wp-postpass_'.COOKIEHASH] != $post->post_password) {  // and it doesn't match the cookie
-            $output = __('There is no excerpt because this is a protected post.');
-            return $output;
-        }
-    }
-
-    // If we haven't got an excerpt, make one in the style of the rss ones
-    if (($output == '') && $fakeit) {
-        $output = $post->post_content;
-        $output = strip_tags($output);
-        $blah = explode(' ', $output);
-        $excerpt_length = 70;
-        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) ? '...' : '';
-        $output = $excerpt;
-    } // end if no excerpt
-    return $output;
+    global $id, $post;
+    $output = '';
+    $output = $post->post_excerpt;
+    if (!empty($post->post_password)) { // if there's a password
+        if ($_COOKIE['wp-postpass_'.COOKIEHASH] != $post->post_password) {  // and it doesn't match the cookie
+            $output = __('There is no excerpt because this is a protected post.');
+            return $output;
+        }
+    }
+
+    return apply_filters('get_the_excerpt', $output);
 }