diff --git a/core/modules/history/lib/Drupal/history/Plugin/views/field/HistoryUserTimestamp.php b/core/modules/history/lib/Drupal/history/Plugin/views/field/HistoryUserTimestamp.php index f0a56a3..fbd6b0b 100644 --- a/core/modules/history/lib/Drupal/history/Plugin/views/field/HistoryUserTimestamp.php +++ b/core/modules/history/lib/Drupal/history/Plugin/views/field/HistoryUserTimestamp.php @@ -90,12 +90,7 @@ function render($values) { elseif ($last_comment > $last_read && $last_comment > HISTORY_READ_LIMIT) { $mark = MARK_UPDATED; } - - $build = array( - '#type' => 'mark', - '#mark_type' => $mark, - ); - return $this->render_link(drupal_render($build), $values); + return $this->render_link(theme('mark', array('mark_type' => $mark)), $values); } } diff --git a/core/modules/node/node.admin.inc b/core/modules/node/node.admin.inc index e75b066..227b284 100644 --- a/core/modules/node/node.admin.inc +++ b/core/modules/node/node.admin.inc @@ -537,16 +537,12 @@ function node_admin_nodes() { ); foreach ($nodes as $node) { $l_options = $node->langcode != Language::LANGCODE_NOT_SPECIFIED && isset($languages[$node->langcode]) ? array('language' => $languages[$node->langcode]) : array(); - $mark = array( - '#type' => 'mark', - '#mark_type' => node_mark($node->nid, $node->changed), - ); $form['nodes'][$node->nid]['title'] = array( '#type' => 'link', '#title' => $node->label(), '#href' => 'node/' . $node->nid, '#options' => $l_options, - '#suffix' => ' ' . drupal_render($mark), + '#suffix' => ' ' . theme('mark', array('mark_type' => node_mark($node->nid, $node->changed))), ); $form['nodes'][$node->nid]['type'] = array( '#markup' => check_plain(node_get_type_label($node)), diff --git a/core/modules/node/node.module b/core/modules/node/node.module index 989faed..1d2de3d 100644 --- a/core/modules/node/node.module +++ b/core/modules/node/node.module @@ -1914,14 +1914,9 @@ function theme_node_recent_block($variables) { function theme_node_recent_content($variables) { $node = $variables['node']; - $mark = array( - '#type' => 'mark', - '#mark_type' => node_mark($node->nid, $node->changed), - ); - $output = '
'; $output .= l($node->label(), 'node/' . $node->nid); - $output .= drupal_render($mark); + $output .= theme('mark', array('mark_type' => node_mark($node->nid, $node->changed))); $output .= '
'; $output .= theme('username', array('account' => user_load($node->uid))); $output .= '
'; diff --git a/core/modules/tracker/tracker.pages.inc b/core/modules/tracker/tracker.pages.inc index 5366470..93c39fb 100644 --- a/core/modules/tracker/tracker.pages.inc +++ b/core/modules/tracker/tracker.pages.inc @@ -73,14 +73,11 @@ function tracker_page($account = NULL, $set_title = FALSE) { $comments .= l(format_plural($new, '1 new', '@count new'), 'node/' . $node->nid, array('fragment' => 'new')); } } - $mark = array( - '#type' => 'mark', - '#mark_type' => node_mark($node->nid, $node->changed), - ); + $row = array( 'type' => check_plain(node_get_type_label($node)), // Do not use $node->label(), because $node comes from the database. - 'title' => array('data' => l($node->title, 'node/' . $node->nid) . ' ' . drupal_render($mark)), + 'title' => array('data' => l($node->title, 'node/' . $node->nid) . ' ' . theme('mark', array('mark_type' => node_mark($node->nid, $node->changed)))), 'author' => array('data' => theme('username', array('account' => $node))), 'replies' => array('class' => array('replies'), 'data' => $comments), 'last updated' => array('data' => t('!time ago', array('!time' => format_interval(REQUEST_TIME - $node->last_activity)))),