summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modules/node/node.module2
-rw-r--r--modules/node/node.tpl.php12
-rw-r--r--modules/rdf/rdf.module2
-rw-r--r--themes/garland/node.tpl.php2
4 files changed, 10 insertions, 8 deletions
diff --git a/modules/node/node.module b/modules/node/node.module
index 8b455f992..beaf71341 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -1341,7 +1341,7 @@ function template_preprocess_node(&$variables) {
$variables['date'] = format_date($node->created);
$variables['name'] = theme('username', array('account' => $node));
$variables['node_url'] = url('node/' . $node->nid);
- $variables['node_title'] = check_plain($node->title);
+ $variables['title'] = check_plain($node->title);
$variables['page'] = node_is_page($node);
if (!empty($node->in_preview)) {
diff --git a/modules/node/node.tpl.php b/modules/node/node.tpl.php
index 4c46a73c5..8867472ec 100644
--- a/modules/node/node.tpl.php
+++ b/modules/node/node.tpl.php
@@ -7,8 +7,8 @@
*
* Available variables:
* - $title: the (sanitized) title of the node.
- * - $content: An array of node items. Use render($content) to print them all, or
- * print a subset such as render($content['field_example']). Use
+ * - $content: An array of node items. Use render($content) to print them all,
+ * or print a subset such as render($content['field_example']). Use
* hide($content['field_example']) to temporarily suppress the printing of a
* given element.
* - $user_picture: The node author's picture from user-picture.tpl.php.
@@ -20,7 +20,8 @@
* - $display_submitted: whether submission information should be displayed.
* - $classes: String of classes that can be used to style contextually through
* CSS. It can be manipulated through the variable $classes_array from
- * preprocess functions. The default values can be one or more of the following:
+ * preprocess functions. The default values can be one or more of the
+ * following:
* - node: The current template type, i.e., "theming hook".
* - node-[type]: The current node type. For example, if the node is a
* "Blog entry" it would result in "node-blog". Note that the machine
@@ -29,7 +30,8 @@
* - node-preview: Nodes in preview mode.
* The following are controlled through the node publishing options.
* - node-promoted: Nodes promoted to the front page.
- * - node-sticky: Nodes ordered above other non-sticky nodes in teaser listings.
+ * - node-sticky: Nodes ordered above other non-sticky nodes in teaser
+ * listings.
* - node-unpublished: Unpublished nodes visible only to administrators.
* - $title_prefix (array): An array containing additional output populated by
* modules, intended to be displayed in front of the main title tag that
@@ -82,7 +84,7 @@
<?php print render($title_prefix); ?>
<?php if (!$page): ?>
- <h2<?php print $title_attributes; ?>><a href="<?php print $node_url; ?>"><?php print $node_title; ?></a></h2>
+ <h2<?php print $title_attributes; ?>><a href="<?php print $node_url; ?>"><?php print $title; ?></a></h2>
<?php endif; ?>
<?php print render($title_suffix); ?>
diff --git a/modules/rdf/rdf.module b/modules/rdf/rdf.module
index 03c153b8e..9e971ce05 100644
--- a/modules/rdf/rdf.module
+++ b/modules/rdf/rdf.module
@@ -456,7 +456,7 @@ function rdf_preprocess_node(&$variables) {
$element = array(
'#tag' => 'meta',
'#attributes' => array(
- 'content' => $variables['node_title'],
+ 'content' => $variables['title'],
'about' => $variables['node_url'],
),
);
diff --git a/themes/garland/node.tpl.php b/themes/garland/node.tpl.php
index 3b06a2d11..5249188ef 100644
--- a/themes/garland/node.tpl.php
+++ b/themes/garland/node.tpl.php
@@ -7,7 +7,7 @@
<?php print render($title_prefix); ?>
<?php if (!$page): ?>
- <h2<?php print $title_attributes; ?>><a href="<?php print $node_url; ?>"><?php print $node_title; ?></a></h2>
+ <h2<?php print $title_attributes; ?>><a href="<?php print $node_url; ?>"><?php print $title; ?></a></h2>
<?php endif; ?>
<?php print render($title_suffix); ?>