Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#201667 follow up by gpk: minor code comment and whitespace cleanup

6.x
Gábor Hojtsy 2008-01-10 15:57:10 +00:00
parent c5aa55b38e
commit a541e5fbfb
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/node/node.module
View File

@ -235,7 +235,7 @@ function node_teaser_js(&$form, &$form_state) {
}
/**
* Ensure value of "teaser_include" checkbox is consistent with other form data
* Ensure value of "teaser_include" checkbox is consistent with other form data.
*
* This handles two situations in which an unchecked checkbox is rejected:
*
@ -251,19 +251,19 @@ function node_teaser_js(&$form, &$form_state) {
*/
function node_teaser_include_verify(&$form, &$form_state) {
$message = '';
// $form['#post'] is set only when the form is built for preview/submit.
if (isset($form['#post']['body']) && isset($form_state['values']['teaser_include']) && !$form_state['values']['teaser_include']) {
// "teaser_include" checkbox is present and unchecked.
if (strpos($form_state['values']['body'], '<!--break-->') === 0) {
// Teaser is empty string
// Teaser is empty string.
$message = t('You specified that the summary should not be shown when this post is displayed in full view. This setting is ignored when the summary is empty.');
}
elseif (strpos($form_state['values']['body'], '<!--break-->') === FALSE) {
// Teaser delimiter is not present in the body.
$message = t('You specified that the summary should not be shown when this post is displayed in full view. This setting has been ignored since you have not defined a summary for the post. (To define a summary, insert the delimiter "&lt;!--break--&gt;" (without the quotes) in the Body of the post to indicate the end of the summary and the start of the main content.)');
}
if (!empty($message)) {
drupal_set_message($message, 'warning');
// Pass new checkbox value on to preview/submit form processing.

4
modules/node/node.pages.inc
View File

@ -414,7 +414,7 @@ function node_preview($node) {
*/
function theme_node_preview($node) {
$output = '<div class="preview">';
$preview_trimmed_version = FALSE;
// Do we need to preview trimmed version of post as well as full version?
if (isset($node->teaser) && isset($node->body)) {
@ -428,7 +428,7 @@ function theme_node_preview($node) {
$preview_trimmed_version = TRUE;
}
}
if ($preview_trimmed_version) {
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.<span class="no-js"> You can insert the delimiter "&lt;!--break--&gt;" (without the quotes) to fine-tune where your post gets split.</span>'));
$output .= '<h3>'. t('Preview trimmed version') .'</h3>';