summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDries Buytaert2009-07-14 10:42:11 (GMT)
committerDries Buytaert2009-07-14 10:42:11 (GMT)
commit3269eb2e08b2958a5b93333d1a94ce56a9e1b0bc (patch)
tree7fb78a21af985911a309e177e7e174dd49e13479
parent2ea8bd980144876bc72095720e868d114bf3e1c8 (diff)
- Patch #504074 by Bojhan, tic2000, royroy, catch, keith.smith et al: improved form description of teaser length setting.
-rw-r--r--modules/aggregator/aggregator.processor.inc2
-rw-r--r--modules/node/content_types.inc2
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/aggregator/aggregator.processor.inc b/modules/aggregator/aggregator.processor.inc
index 567db26..8010f7a 100644
--- a/modules/aggregator/aggregator.processor.inc
+++ b/modules/aggregator/aggregator.processor.inc
@@ -117,7 +117,7 @@ function aggregator_form_aggregator_admin_form_alter(&$form, $form_state) {
'#title' => t('Length of trimmed description'),
'#default_value' => 600,
'#options' => drupal_map_assoc(array(0, 200, 400, 600, 800, 1000, 1200, 1400, 1600, 1800, 2000), '_aggregator_characters'),
- '#description' => t("The maximum number of characters used in the trimmed version of a description. Drupal will use this setting to determine at which offset long descriptions should be trimmed. Note that this setting will only affect new or updated content and will not affect existing teasers.")
+ '#description' => t("The maximum number of characters used in the trimmed version of content.")
);
}
diff --git a/modules/node/content_types.inc b/modules/node/content_types.inc
index 441a8b5..b1f5c06 100644
--- a/modules/node/content_types.inc
+++ b/modules/node/content_types.inc
@@ -187,7 +187,7 @@ function node_type_form(&$form_state, $type = NULL) {
'#title' => t('Length of trimmed posts'),
'#default_value' => variable_get('teaser_length_' . $type->type, 600),
'#options' => drupal_map_assoc(array(0, 200, 400, 600, 800, 1000, 1200, 1400, 1600, 1800, 2000), '_node_characters'),
- '#description' => t("The maximum number of characters used in the trimmed version of a post. Drupal will use this setting to determine at which offset long posts should be trimmed. The trimmed version of a post is typically used as a teaser when displaying the post on the main page, in XML feeds, etc. To disable teasers, set to 'Unlimited'.")
+ '#description' => t("The maximum number of characters used in the trimmed version of content.")
);
$form['old_type'] = array(
'#type' => 'value',