From 79f08aca2c29c9f2bf8fd7514b0eab20b8e90711 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sun, 7 Aug 2005 14:55:17 +0000
Subject: [PATCH] - Patch #26637 by Robert Douglas: $teaser misnamed in themes
theme_node().
TODO: update documentation!
---
modules/blogapi.module | 2 +-
modules/blogapi/blogapi.module | 2 +-
modules/node.module | 2 +-
modules/node/node.module | 2 +-
themes/chameleon/chameleon.theme | 6 +++---
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/modules/blogapi.module b/modules/blogapi.module
index 0db78efcee12..6b35a68efea1 100644
--- a/modules/blogapi.module
+++ b/modules/blogapi.module
@@ -514,7 +514,7 @@ function blogapi_validate_user($username, $password) {
global $user;
$user = user_authenticate($username, $password);
-
+
if ($user->uid) {
if (user_access('edit own blog', $user)) {
return $user;
diff --git a/modules/blogapi/blogapi.module b/modules/blogapi/blogapi.module
index 0db78efcee12..6b35a68efea1 100644
--- a/modules/blogapi/blogapi.module
+++ b/modules/blogapi/blogapi.module
@@ -514,7 +514,7 @@ function blogapi_validate_user($username, $password) {
global $user;
$user = user_authenticate($username, $password);
-
+
if ($user->uid) {
if (user_access('edit own blog', $user)) {
return $user;
diff --git a/modules/node.module b/modules/node.module
index f8faca73d916..6aede84346aa 100644
--- a/modules/node.module
+++ b/modules/node.module
@@ -464,7 +464,7 @@ function node_save($node) {
* @param $node
* A node array or node object.
* @param $teaser
- * Whether to display only the teaser for the node.
+ * Whether to display the teaser only, as on the main page.
* @param $page
* Whether the node is being displayed by itself as a page.
* @param $links
diff --git a/modules/node/node.module b/modules/node/node.module
index f8faca73d916..6aede84346aa 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -464,7 +464,7 @@ function node_save($node) {
* @param $node
* A node array or node object.
* @param $teaser
- * Whether to display only the teaser for the node.
+ * Whether to display the teaser only, as on the main page.
* @param $page
* Whether the node is being displayed by itself as a page.
* @param $links
diff --git a/themes/chameleon/chameleon.theme b/themes/chameleon/chameleon.theme
index 26b380ca4a39..cc0dce0b286e 100644
--- a/themes/chameleon/chameleon.theme
+++ b/themes/chameleon/chameleon.theme
@@ -107,17 +107,17 @@ function chameleon_page($content) {
return $output;
}
-function chameleon_node($node, $main = 0, $page = 0) {
+function chameleon_node($node, $teaser = 0, $page = 0) {
$output = "<div class=\"node\">\n";
if (!$page) {
- $output .= " <h2 class=\"title\">". ($main ? l($node->title, "node/$node->nid") : check_plain($node->title)) ."</h2>\n";
+ $output .= " <h2 class=\"title\">". ($teaser ? l($node->title, "node/$node->nid") : check_plain($node->title)) ."</h2>\n";
}
$output .= " <div class=\"content\">\n";
- if ($main && $node->teaser) {
+ if ($teaser && $node->teaser) {
$output .= $node->teaser;
}
else {
--
GitLab