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

git-svn-id: https://develop.svn.wordpress.org/trunk@4821 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Mark Jaquith 2007-01-27 23:31:42 +00:00
parent 2fd34af717
commit 24e66041c0
1 changed files with 4 additions and 4 deletions

View File

@ -74,16 +74,16 @@ function &get_children($args = '', $output = OBJECT) {
// get extended entry info (<!--more-->)
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;
$extended = '';
}
// 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);
}