summaryrefslogtreecommitdiff
path: root/modules/node
diff options
context:
space:
mode:
authorAngie Byron <webchick@24967.no-reply.drupal.org>2008-10-11 21:11:02 +0000
committerAngie Byron <webchick@24967.no-reply.drupal.org>2008-10-11 21:11:02 +0000
commitecf7ad41d0c3b8d4ea12e3883d3b5c9060eb2963 (patch)
tree264c817491a1484683e8adb2a2f47e344ef44717 /modules/node
parent4002681267044ab1d226ffeade7b8f6fface18ae (diff)
downloadbrdo-ecf7ad41d0c3b8d4ea12e3883d3b5c9060eb2963.tar.gz
brdo-ecf7ad41d0c3b8d4ea12e3883d3b5c9060eb2963.tar.bz2
#242873 by pwolanin and bjaspan: Make drupal_set_title() do check_plain() by default.
Diffstat (limited to 'modules/node')
-rw-r--r--modules/node/node.module4
-rw-r--r--modules/node/node.pages.inc8
2 files changed, 6 insertions, 6 deletions
diff --git a/modules/node/node.module b/modules/node/node.module
index 176804062..48e75a3be 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -1142,7 +1142,7 @@ function node_build_content($node, $teaser = FALSE, $page = FALSE) {
*/
function node_show($node, $cid, $message = FALSE) {
if ($message) {
- drupal_set_title(t('Revision of %title from %date', array('%title' => $node->title, '%date' => format_date($node->revision_timestamp))));
+ drupal_set_title(t('Revision of %title from %date', array('%title' => $node->title, '%date' => format_date($node->revision_timestamp))), PASS_THROUGH);
}
$output = node_view($node, FALSE, TRUE);
@@ -1857,7 +1857,7 @@ function node_page_default() {
* Menu callback; view a single node.
*/
function node_page_view($node, $cid = NULL) {
- drupal_set_title(check_plain($node->title));
+ drupal_set_title($node->title);
return node_show($node, $cid);
}
diff --git a/modules/node/node.pages.inc b/modules/node/node.pages.inc
index 3868fd51a..452f3f853 100644
--- a/modules/node/node.pages.inc
+++ b/modules/node/node.pages.inc
@@ -11,7 +11,7 @@
* Menu callback; presents the node editing form, or redirects to delete confirmation.
*/
function node_page_edit($node) {
- drupal_set_title(check_plain($node->title));
+ drupal_set_title($node->title);
return drupal_get_form($node->type . '_node_form', $node);
}
@@ -59,7 +59,7 @@ function node_add($type) {
// Initialize settings:
$node = array('uid' => $user->uid, 'name' => (isset($user->name) ? $user->name : ''), 'type' => $type, 'language' => '');
- drupal_set_title(t('Create @name', array('@name' => $types[$type]->name)));
+ drupal_set_title(t('Create @name', array('@name' => $types[$type]->name)), PASS_THROUGH);
$output = drupal_get_form($type . '_node_form', $node);
}
@@ -381,7 +381,7 @@ function node_preview($node) {
$cloned_node->build_mode = NODE_BUILD_PREVIEW;
$output = theme('node_preview', $cloned_node);
}
- drupal_set_title(t('Preview'));
+ drupal_set_title(t('Preview'), PASS_THROUGH);
return $output;
}
@@ -504,7 +504,7 @@ function node_delete_confirm_submit($form, &$form_state) {
* Generate an overview table of older revisions of a node.
*/
function node_revision_overview($node) {
- drupal_set_title(t('Revisions for %title', array('%title' => $node->title)));
+ drupal_set_title(t('Revisions for %title', array('%title' => $node->title)), PASS_THROUGH);
$header = array(t('Revision'), array('data' => t('Operations'), 'colspan' => 2));