Changeset 4821

Timestamp:

01/27/2007 11:31:42 PM (18 years ago)

Author:

markjaquith

Message:

Make <!--more--> regex non-greedy. Props Curloso and Viper007Bond. fixes #3698

File:

• trunk/wp-includes/post.php (modified) (2 diffs)

trunk/wp-includes/post.php

@@ -75 +75 @@
 function get_extended($post) {
     //Match the new style more links
-    if (preg_match('/<!--more(.+?)?-->/', $post, $matches)) {
-        list($main,$extended) = explode($matches[0],$post,2);
+    if ( preg_match('/<!--more(.*?)-->/', $post, $matches) ) {
+        list($main, $extended) = explode($matches[0], $post, 2);
     } else {
         $main = $post;
@@ -83 +83 @@
     
     // Strip leading and trailing whitespace
-    $main = preg_replace('/^[\s]*(.*)[\s]*$/','\\1',$main);
-    $extended = preg_replace('/^[\s]*(.*)[\s]*$/','\\1',$extended);
+    $main = preg_replace('/^[\s]*(.*)[\s]*$/', '\\1', $main);
+    $extended = preg_replace('/^[\s]*(.*)[\s]*$/', '\\1', $extended);
 
     return array('main' => $main, 'extended' => $extended);