Index: modules/blogapi/blogapi.module =================================================================== RCS file: /cvs/drupal/drupal/modules/blogapi/blogapi.module,v retrieving revision 1.99 diff -u -p -r1.99 blogapi.module --- modules/blogapi/blogapi.module 21 Nov 2006 20:14:17 -0000 1.99 +++ modules/blogapi/blogapi.module 4 Jan 2007 22:20:02 -0000 @@ -14,7 +14,7 @@ function blogapi_help($section) { case 'admin/help#blogapi': $output = '

'. t('The blog API module enables a post to be posted to a site via external GUI applications. Many users prefer to use external tools to improve their ability to read and post responses in a customized way. The blog api provides users the freedom to use the blogging tools they want but still have the blogging server of choice.') .'

'; $output .= '

'. t('When this module is enabled and configured you can use programs like Ecto to create and publish posts from your desktop. Blog API module supports several XML-RPC based blogging APIs such as the Blogger API, MetaWeblog API, and most of the Movable Type API. Any desktop blogging tools or other services (e.g. Flickr\'s "post to blog") that support these APIs should work with this site.', array('@external-http-ecto-kung-foo-tv' => 'http://ecto.kung-foo.tv/', '@-' => url('http://www.blogger.com/developers/api/1_docs/'), '@external-http-www-xmlrpc-com-metaWeblogApi' => 'http://www.xmlrpc.com/metaWeblogApi', '@external-http-www-movabletype-org-docs-mtmanual_programmatic-html' => 'http://www.movabletype.org/docs/mtmanual_programmatic.html', '@external-http-www-flickr-com' => 'http://www.flickr.com')) .'

'; - $output .= '

'. t('This module also allows site administrators to configure which content types can be posted via the external applications. So, for instance, users can post forum topics as well as blog posts. Where supported, the external applications will display each content type as a separate "blog".') .'

'; + $output .= '

'. t('This module also allows site administrators to configure which content types can be posted via the external applications. So, for instance, users can post forum topics as well as blog posts. Where supported, the external applications will display each content type as a separate "blog".') .'

'; $output .= '

'. t('For more information please read the configuration and customization handbook BlogApi page.', array('@blogapi' => 'http://drupal.org/handbook/modules/blogapi/')) .'

'; return $output; } Index: modules/book/book.module =================================================================== RCS file: /cvs/drupal/drupal/modules/book/book.module,v retrieving revision 1.404 diff -u -p -r1.404 book.module --- modules/book/book.module 29 Dec 2006 07:41:44 -0000 1.404 +++ modules/book/book.module 4 Jan 2007 22:20:02 -0000 @@ -781,7 +781,7 @@ function book_recurse($nid = 0, $depth = */ function book_node_visitor_html_pre($node, $depth, $nid) { // Remove the delimiter (if any) that separates the teaser from the body. - $node->body = str_replace('', '', $node->body); + $node->body = str_replace('', '', $node->body); // The 'view' hook can be implemented to overwrite the default function // to display nodes. Index: modules/node/node.module =================================================================== RCS file: /cvs/drupal/drupal/modules/node/node.module,v retrieving revision 1.765 diff -u -p -r1.765 node.module --- modules/node/node.module 4 Jan 2007 09:53:58 -0000 1.765 +++ modules/node/node.module 4 Jan 2007 22:20:05 -0000 @@ -146,7 +146,7 @@ function node_teaser($body, $format = NU $size = variable_get('teaser_length', 600); // Find where the delimiter is in the body - $delimiter = strpos($body, ''); + $delimiter = strpos($body, variable_get('node_teaser_break', '')); // If the size is zero, and there is no delimiter, the entire body is the teaser. if ($size == 0 && $delimiter === FALSE) { @@ -738,7 +738,7 @@ function node_prepare($node, $teaser = F */ function node_build_content($node, $teaser = FALSE, $page = FALSE) { // Remove the delimiter (if any) that separates the teaser from the body. - $node->body = str_replace('', '', $node->body); + $node->body = str_replace(variable_get('node_teaser_break', ''), '', $node->body); // The 'view' hook can be implemented to overwrite the default function // to display nodes. @@ -2199,7 +2199,7 @@ function node_preview($node) { function theme_node_preview($node) { $output = '
'; if ($node->teaser && $node->teaser != $node->body) { - drupal_set_message(t('The trimmed version of your post shows what your post looks like when promoted to the main page or when exported for syndication. You can insert the delimiter "<break>" (without the quotes) to fine-tune where your post gets split.')); + drupal_set_message(t('The trimmed version of your post shows what your post looks like when promoted to the main page or when exported for syndication. You can insert the delimiter "<!--break-->" (without the quotes) to fine-tune where your post gets split.')); $output .= '

'. t('Preview trimmed version') .'

'; $output .= node_view(drupal_clone($node), 1, FALSE, 0); $output .= '

'. t('Preview full version') .'

'; Index: modules/system/system.install =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.install,v retrieving revision 1.66 diff -u -p -r1.66 system.install --- modules/system/system.install 3 Jan 2007 11:10:58 -0000 1.66 +++ modules/system/system.install 4 Jan 2007 22:20:07 -0000 @@ -3452,18 +3452,9 @@ function system_update_1017() { } /** - * Change break tag. - */ -function system_update_1018() { - $ret = array(); - $ret[] = update_sql("UPDATE {node_revisions} SET body = REPLACE(body, '', '')"); - return $ret; -} - -/** * Change variable format for user-defined e-mails. */ -function system_update_1019() { +function system_update_1018() { $message_ids = array('welcome_subject', 'welcome_body', 'approval_subject', 'approval_body', 'pass_subject', 'pass_body',