summaryrefslogtreecommitdiff
path: root/modules/field
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2009-07-01 12:10:32 +0000
committerDries Buytaert <dries@buytaert.net>2009-07-01 12:10:32 +0000
commit199dc7cc9d18378d4a3ca19551984381b6094744 (patch)
tree75aae493cd1247a70e71194c0f27552f007378da /modules/field
parent75d449d1eb5b87a8b94e22622102905b1ac58612 (diff)
downloadbrdo-199dc7cc9d18378d4a3ca19551984381b6094744.tar.gz
brdo-199dc7cc9d18378d4a3ca19551984381b6094744.tar.bz2
- Patch #504564 by tic2000: fixed teaser length setting and added tests.
Diffstat (limited to 'modules/field')
-rw-r--r--modules/field/modules/text/text.module3
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/field/modules/text/text.module b/modules/field/modules/text/text.module
index fe6e1da80..bd241342b 100644
--- a/modules/field/modules/text/text.module
+++ b/modules/field/modules/text/text.module
@@ -317,7 +317,8 @@ function theme_field_formatter_text_summary_or_trimmed($element) {
return $element['#item']['safe_summary'];
}
else {
- return text_summary($element['#item']['safe'], $instance['settings']['text_processing'] ? $element['#item']['format'] : NULL);
+ $size = variable_get('teaser_length_' . $element['#bundle'], 600);
+ return text_summary($element['#item']['safe'], $instance['settings']['text_processing'] ? $element['#item']['format'] : NULL, $size);
}
}