diff options
| -rw-r--r-- | modules/node/node.module | 9 | ||||
| -rw-r--r-- | modules/system/system.install | 9 |
2 files changed, 13 insertions, 5 deletions
diff --git a/modules/node/node.module b/modules/node/node.module index 476242f24..78c9cc13d 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -145,8 +145,8 @@ function node_teaser($body, $format = NULL) { $size = variable_get('teaser_length', 600); - // find where the delimiter is in the body - $delimiter = strpos($body, '<!--break-->'); + // Find where the delimiter is in the body + $delimiter = strpos($body, '<break>'); // If the size is zero, and there is no delimiter, the entire body is the teaser. if ($size == 0 && $delimiter === FALSE) { @@ -723,8 +723,7 @@ function node_prepare($node, $teaser = FALSE) { */ function node_build_content($node, $teaser = FALSE, $page = FALSE) { // Remove the delimiter (if any) that separates the teaser from the body. - // TODO: this strips legitimate uses of '<!--break-->' also. - $node->body = str_replace('<!--break-->', '', $node->body); + $node->body = str_replace('<break>', '', $node->body); // The 'view' hook can be implemented to overwrite the default function // to display nodes. @@ -2173,7 +2172,7 @@ function node_preview($node) { function theme_node_preview($node) { $output = '<div class="preview">'; 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 .= '<h3>'. t('Preview trimmed version') .'</h3>'; $output .= node_view(drupal_clone($node), 1, FALSE, 0); $output .= '<h3>'. t('Preview full version') .'</h3>'; diff --git a/modules/system/system.install b/modules/system/system.install index 9b0c77da1..42c4728a9 100644 --- a/modules/system/system.install +++ b/modules/system/system.install @@ -3421,6 +3421,15 @@ function system_update_1017() { } /** + * Change break tag. + */ +function system_update_1018() { + $ret = array(); + $ret[] = update_sql("UPDATE {node_revisions} SET body = REPLACE(body, '<!--break-->', '<break>')"); + return $ret; +} + +/** * @} End of "defgroup updates-4.7-to-5.0" */ |