Ticket #25349: 25349.patch

src/wp-includes/formatting.php

@@ -2369 +2369 @@
  * @return string The excerpt.
  */
 function wp_trim_excerpt($text = '') {
+        global $more;
+
         $raw_excerpt = $text;
         if ( '' == $text ) {
+                // Temporarily set $more to 0, to respect manual excerpts created using <!-- more -->.
+                $tmp_more = $more;
+                $more = 0;
+
                 $text = get_the_content('');
 
+                // Reset $more to its original value.
+                $more = $tmp_more;
+
                 $text = strip_shortcodes( $text );
 
                 /** This filter is documented in wp-includes/post-template.php */