summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--misc/drupal.css3
-rw-r--r--modules/node.module6
-rw-r--r--modules/node/node.module6
3 files changed, 9 insertions, 6 deletions
diff --git a/misc/drupal.css b/misc/drupal.css
index 21a5a52fd..64c789f09 100644
--- a/misc/drupal.css
+++ b/misc/drupal.css
@@ -332,6 +332,9 @@ tr.odd .form-item, tr.even .form-item {
margin-left: 0.5em;
clear: right;
}
+td.revision-current {
+ background: #ffc;
+}
dl.multiselect dd.b, dl.multiselect dd.b .form-item, dl.multiselect dd.b select {
font-family: inherit;
font-size: inherit;
diff --git a/modules/node.module b/modules/node.module
index 26b787c8a..6288c2007 100644
--- a/modules/node.module
+++ b/modules/node.module
@@ -524,7 +524,7 @@ function node_view($node, $teaser = FALSE, $page = FALSE, $links = TRUE) {
$node->body = str_replace('<!--break-->', '', $node->body);
if ($node->log != '' && !$teaser && $node->moderate) {
- $node->body .= '<div class="log"><div class="title">'. t('Log') .':</div>'. check_plain($node->log) .'</div>';
+ $node->body .= '<div class="log"><div class="title">'. t('Log') .':</div>'. filter_xss($node->log) .'</div>';
}
// The 'view' hook can be implemented to overwrite the default function
@@ -1290,13 +1290,13 @@ function node_revision_overview($node) {
if ($revision->current_vid > 0) {
$row[] = array('data' => t('%date by %username', array('%date' => l(format_date($revision->timestamp, 'small'), "node/$node->nid"), '%username' => theme('username', $revision)))
- . (($revision->log != '') ? '<p class="revision-log">'. check_plain($revision->log) .'</p>' : ''),
+ . (($revision->log != '') ? '<p class="revision-log">'. filter_xss($revision->log) .'</p>' : ''),
'class' => 'revision-current');
$operations[] = array('data' => theme('placeholder', t('current revision')), 'class' => 'revision-current', 'colspan' => 2);
}
else {
$row[] = t('%date by %username', array('%date' => l(format_date($revision->timestamp, 'small'), "node/$node->nid/revisions/$revision->vid/view"), '%username' => theme('username', $revision)))
- . (($revision->log != '') ? '<p class="revision-log">'. check_plain($revision->log) .'</p>' : '');
+ . (($revision->log != '') ? '<p class="revision-log">'. filter_xss($revision->log) .'</p>' : '');
if ($revert_permission) {
$operations[] = l(t('revert'), "node/$node->nid/revisions/$revision->vid/revert");
}
diff --git a/modules/node/node.module b/modules/node/node.module
index 26b787c8a..6288c2007 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -524,7 +524,7 @@ function node_view($node, $teaser = FALSE, $page = FALSE, $links = TRUE) {
$node->body = str_replace('<!--break-->', '', $node->body);
if ($node->log != '' && !$teaser && $node->moderate) {
- $node->body .= '<div class="log"><div class="title">'. t('Log') .':</div>'. check_plain($node->log) .'</div>';
+ $node->body .= '<div class="log"><div class="title">'. t('Log') .':</div>'. filter_xss($node->log) .'</div>';
}
// The 'view' hook can be implemented to overwrite the default function
@@ -1290,13 +1290,13 @@ function node_revision_overview($node) {
if ($revision->current_vid > 0) {
$row[] = array('data' => t('%date by %username', array('%date' => l(format_date($revision->timestamp, 'small'), "node/$node->nid"), '%username' => theme('username', $revision)))
- . (($revision->log != '') ? '<p class="revision-log">'. check_plain($revision->log) .'</p>' : ''),
+ . (($revision->log != '') ? '<p class="revision-log">'. filter_xss($revision->log) .'</p>' : ''),
'class' => 'revision-current');
$operations[] = array('data' => theme('placeholder', t('current revision')), 'class' => 'revision-current', 'colspan' => 2);
}
else {
$row[] = t('%date by %username', array('%date' => l(format_date($revision->timestamp, 'small'), "node/$node->nid/revisions/$revision->vid/view"), '%username' => theme('username', $revision)))
- . (($revision->log != '') ? '<p class="revision-log">'. check_plain($revision->log) .'</p>' : '');
+ . (($revision->log != '') ? '<p class="revision-log">'. filter_xss($revision->log) .'</p>' : '');
if ($revert_permission) {
$operations[] = l(t('revert'), "node/$node->nid/revisions/$revision->vid/revert");
}