summaryrefslogtreecommitdiff
path: root/themes
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2005-08-10 20:55:59 +0000
committerDries Buytaert <dries@buytaert.net>2005-08-10 20:55:59 +0000
commit6baa2ba1408537e021de8ae987b2f83f2a31e493 (patch)
tree125e9adee079963789f60a70c958face69f7c046 /themes
parentf3b28d37d19a0f854570e21cd21dcec7477759eb (diff)
downloadbrdo-6baa2ba1408537e021de8ae987b2f83f2a31e493.tar.gz
brdo-6baa2ba1408537e021de8ae987b2f83f2a31e493.tar.bz2
- Patch #26637 by Robert Douglas: he documentation to theme_node clearly says the the parameter $teaser is "Whether to display the teaser only, as on the main page." Naming this parameter $main in the themes is confusing.
Diffstat (limited to 'themes')
-rw-r--r--themes/engines/phptemplate/phptemplate.engine6
1 files changed, 3 insertions, 3 deletions
diff --git a/themes/engines/phptemplate/phptemplate.engine b/themes/engines/phptemplate/phptemplate.engine
index 57c203a29..dde0ae2f7 100644
--- a/themes/engines/phptemplate/phptemplate.engine
+++ b/themes/engines/phptemplate/phptemplate.engine
@@ -193,7 +193,7 @@ function phptemplate_page($content) {
* Prepare the values passed to the theme_node function to be passed
* into a pluggable template engine.
*/
-function phptemplate_node($node, $main = 0, $page = 0) {
+function phptemplate_node($node, $teaser = 0, $page = 0) {
if (module_exist('taxonomy')) {
$taxonomy = taxonomy_link('taxonomy terms', $node);
}
@@ -202,15 +202,15 @@ function phptemplate_node($node, $main = 0, $page = 0) {
}
$variables = array(
- 'content' => ($main && $node->teaser) ? $node->teaser : $node->body,
+ 'content' => ($teaser && $node->teaser) ? $node->teaser : $node->body,
'date' => format_date($node->created),
'links' => $node->links ? theme('links', $node->links) : '',
- 'main' => $main,
'name' => theme('username', $node),
'node' => $node, // we pass the actual node to allow more customization
'node_url' => url('node/'. $node->nid),
'page' => $page,
'taxonomy' => $taxonomy,
+ 'teaser' => $teaser,
'terms' => theme('links', $taxonomy),
'title' => check_plain($node->title)
);