diff options
| author | Dries Buytaert <dries@buytaert.net> | 2005-08-07 14:55:17 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2005-08-07 14:55:17 +0000 |
| commit | 79f08aca2c29c9f2bf8fd7514b0eab20b8e90711 (patch) | |
| tree | 92caf8688816e5571a09b73667baf98f4fee6e7d | |
| parent | ed56c57ee0d76215e7021bcaedd36af6992f9303 (diff) | |
| download | brdo-79f08aca2c29c9f2bf8fd7514b0eab20b8e90711.tar.gz brdo-79f08aca2c29c9f2bf8fd7514b0eab20b8e90711.tar.bz2 | |
- Patch #26637 by Robert Douglas: $teaser misnamed in themes theme_node().
TODO: update documentation!
| -rw-r--r-- | modules/blogapi.module | 2 | ||||
| -rw-r--r-- | modules/blogapi/blogapi.module | 2 | ||||
| -rw-r--r-- | modules/node.module | 2 | ||||
| -rw-r--r-- | modules/node/node.module | 2 | ||||
| -rw-r--r-- | themes/chameleon/chameleon.theme | 6 |
5 files changed, 7 insertions, 7 deletions
diff --git a/modules/blogapi.module b/modules/blogapi.module index 0db78efce..6b35a68ef 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 0db78efce..6b35a68ef 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 f8faca73d..6aede8434 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 f8faca73d..6aede8434 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 26b380ca4..cc0dce0b2 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 { |