Ticket #17039: 17039.2.diff

Index: wp-includes/formatting.php
===================================================================
--- wp-includes/formatting.php  (revision 17609)
+++ wp-includes/formatting.php  (working copy)
@@ -1859,23 +1859,38 @@
 function wp_trim_excerpt($text) {
        $raw_excerpt = $text;
        if ( '' == $text ) {
-               $text = get_the_content('');
+               global $page, $pages, $preview;
 
+               $is_teaser = false;
+
+               $text = $pages[$page-1];
+
+               if ( preg_match('/<!--more(.*?)?-->/', $text, $matches) ) {
+                       list($text) = explode($matches[0], $text, 2);
+                       $is_teaser = true;
+               }
+
+               if ( $preview ) // preview fix for javascript bug with foreign languages
+                       $text = preg_replace_callback('/\%u([0-9A-F]{4})/', '_convert_urlencoded_to_entities', $text);
+
                $text = strip_shortcodes( $text );
 
                $text = apply_filters('the_content', $text);
                $text = str_replace(']]>', ']]&gt;', $text);
                $text = strip_tags($text);
                $excerpt_length = apply_filters('excerpt_length', 55);
-               $excerpt_more = apply_filters('excerpt_more', ' ' . '[...]');
+               $excerpt_more = apply_filters('excerpt_more', ' [...]');
                $words = preg_split("/[\n\r\t ]+/", $text, $excerpt_length + 1, PREG_SPLIT_NO_EMPTY);
+
                if ( count($words) > $excerpt_length ) {
                        array_pop($words);
-                       $text = implode(' ', $words);
+                       $is_teaser = true;
+               }
+
+               $text = implode(' ', $words);
+
+               if ( $is_teaser )
                        $text = $text . $excerpt_more;
-               } else {
-                       $text = implode(' ', $words);
-               }
        }
        return apply_filters('wp_trim_excerpt', $text, $raw_excerpt);
 }