summaryrefslogtreecommitdiffstats
path: root/wp-includes/post.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2007-01-30 17:46:07 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2007-01-30 17:46:07 +0000
commit006898584b668bc04aeff31f8180d048e6ca4071 (patch)
tree760b44188ab02261ba351de90e216e1b419fa87c /wp-includes/post.php
parenteeae9d5c09399fa7cb89fe52d5676bf18fa61457 (diff)
downloadwordpress-mu-006898584b668bc04aeff31f8180d048e6ca4071.tar.gz
wordpress-mu-006898584b668bc04aeff31f8180d048e6ca4071.tar.xz
wordpress-mu-006898584b668bc04aeff31f8180d048e6ca4071.zip
WP Merge to rev 3834 and reverted to novalueindb option code
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@873 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/post.php')
-rw-r--r--wp-includes/post.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/wp-includes/post.php b/wp-includes/post.php
index 0fc26de..52ee45a 100644
--- a/wp-includes/post.php
+++ b/wp-includes/post.php
@@ -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);
}