summaryrefslogtreecommitdiffstats
path: root/wp-includes/formatting.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2006-09-12 15:36:57 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2006-09-12 15:36:57 +0000
commitf41f35fc323e7aae3f8c9d7e696eb54e306cc679 (patch)
tree6c998f4e79b9e79b823e01215a2b3f7b0a8e5f90 /wp-includes/formatting.php
parent7a2ba28084eb8b23f9109473d7c57f14c3a059a2 (diff)
downloadwordpress-mu-f41f35fc323e7aae3f8c9d7e696eb54e306cc679.tar.gz
wordpress-mu-f41f35fc323e7aae3f8c9d7e696eb54e306cc679.tar.xz
wordpress-mu-f41f35fc323e7aae3f8c9d7e696eb54e306cc679.zip
WP Merge to rev 4185
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@743 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/formatting.php')
-rw-r--r--wp-includes/formatting.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php
index 0f5cc74..6094dcb 100644
--- a/wp-includes/formatting.php
+++ b/wp-includes/formatting.php
@@ -741,7 +741,7 @@ function human_time_diff( $from, $to = '' ) {
function wp_trim_excerpt($text) { // Fakes an excerpt if needed
global $post;
if ( '' == $text ) {
- $text = $post->post_content;
+ $text = get_the_content('');
$text = apply_filters('the_content', $text);
$text = str_replace(']]>', ']]&gt;', $text);
$text = strip_tags($text);