From 186ebd18da660deb4f20ede1683893b07100fd52 Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Tue, 17 Jan 2006 21:19:43 +0000 Subject: [PATCH] - Patch #42072 by m3avrck: more improvements to the node revesion overview screen. --- misc/drupal.css | 3 +++ modules/node.module | 6 +++--- modules/node/node.module | 6 +++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/misc/drupal.css b/misc/drupal.css index 21a5a52fda4..64c789f0909 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 26b787c8a5c..6288c200751 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('', '', $node->body); if ($node->log != '' && !$teaser && $node->moderate) { - $node->body .= '
'. t('Log') .':
'. check_plain($node->log) .'
'; + $node->body .= '
'. t('Log') .':
'. filter_xss($node->log) .'
'; } // 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 != '') ? '

'. check_plain($revision->log) .'

' : ''), + . (($revision->log != '') ? '

'. filter_xss($revision->log) .'

' : ''), '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 != '') ? '

'. check_plain($revision->log) .'

' : ''); + . (($revision->log != '') ? '

'. filter_xss($revision->log) .'

' : ''); 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 26b787c8a5c..6288c200751 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('', '', $node->body); if ($node->log != '' && !$teaser && $node->moderate) { - $node->body .= '
'. t('Log') .':
'. check_plain($node->log) .'
'; + $node->body .= '
'. t('Log') .':
'. filter_xss($node->log) .'
'; } // 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 != '') ? '

'. check_plain($revision->log) .'

' : ''), + . (($revision->log != '') ? '

'. filter_xss($revision->log) .'

' : ''), '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 != '') ? '

'. check_plain($revision->log) .'

' : ''); + . (($revision->log != '') ? '

'. filter_xss($revision->log) .'

' : ''); if ($revert_permission) { $operations[] = l(t('revert'), "node/$node->nid/revisions/$revision->vid/revert"); }