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:35:18 -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; } @@ -645,7 +645,7 @@ function _blogapi_mt_extra(&$node, $stru // merge the 3 body sections (description, mt_excerpt, mt_text_more) into // one body if ($struct['mt_excerpt']) { - $node->body = $struct['mt_excerpt'] .''.$node->body; + $node->body = $struct['mt_excerpt'] . variable_get('node_teaser_break', '') . $node->body; } if ($struct['mt_text_more']) { $node->body = $node->body . '' . $struct['mt_text_more']; 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:35:19 -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('