diff options
| -rw-r--r-- | modules/node/node.module | 2 | ||||
| -rw-r--r-- | modules/system/system.install | 20 |
2 files changed, 17 insertions, 5 deletions
diff --git a/modules/node/node.module b/modules/node/node.module index dbd4dd3ab..1a0e296e9 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -2199,7 +2199,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 17bd77383..cda02552d 100644 --- a/modules/system/system.install +++ b/modules/system/system.install @@ -3452,12 +3452,11 @@ function system_update_1017() { } /** - * Change break tag. + * Change break tag (was removed, see 1020). */ function system_update_1018() { - $ret = array(); - $ret[] = update_sql("UPDATE {node_revisions} SET body = REPLACE(body, '<!--break-->', '<break>')"); - return $ret; + variable_set('update_1020_ok', TRUE); + return array(); } /** @@ -3479,6 +3478,19 @@ function system_update_1019() { } /** + * Change break tag back (was removed from head). + */ +function system_update_1020() { + $ret = array(); + if (!variable_get('update_1020_ok', FALSE)) { + $ret[] = update_sql("UPDATE {node_revisions} SET body = REPLACE(body, '<break>', '<!--break-->')"); + } + variable_del('update_1020_ok'); + return $ret; +} + + +/** * @} End of "defgroup updates-4.7-to-5.0" */ |