diff --git a/core/includes/theme.inc b/core/includes/theme.inc index 1d72f44c1c68ccdf8e5504897c89c834540ecd2a..78bc8d5cf9f6b5fb7af05851471be6e59b0d02d9 100644 --- a/core/includes/theme.inc +++ b/core/includes/theme.inc @@ -2275,7 +2275,7 @@ function theme_tablesort_indicator($variables) { * MARK_UPDATED, MARK_READ. */ function theme_mark($variables) { - $type = $variables['type']; + $type = $variables['mark_type']; global $user; if ($user->uid) { if ($type == MARK_NEW) { @@ -3172,7 +3172,7 @@ function drupal_common_theme() { 'variables' => array('style' => NULL), ), 'mark' => array( - 'variables' => array('type' => MARK_NEW), + 'variables' => array('mark_type' => MARK_NEW), ), 'item_list' => array( 'variables' => array('items' => array(), 'title' => '', 'type' => 'ul', 'attributes' => array()), 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 4465dacdd65f4293826b79c7893e648349246022..fbd6b0bca0e54256472734be91b1bd078b9382d9 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,7 +90,7 @@ function render($values) { elseif ($last_comment > $last_read && $last_comment > HISTORY_READ_LIMIT) { $mark = MARK_UPDATED; } - return $this->render_link(theme('mark', array('type' => $mark)), $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 88358616f2528be192da572afcc771e3ca1b9667..47ff29311a775fca65e5d72f6d8ce7edb7c5d3a4 100644 --- a/core/modules/node/node.admin.inc +++ b/core/modules/node/node.admin.inc @@ -501,7 +501,7 @@ function node_admin_nodes() { $l_options = $node->langcode != Language::LANGCODE_NOT_SPECIFIED && isset($languages[$node->langcode]) ? array('language' => $languages[$node->langcode]) : array(); $mark = array( '#theme' => 'mark', - '#type' => node_mark($node->nid, $node->changed), + '#mark_type' => node_mark($node->nid, $node->changed), ); $form['nodes'][$node->nid]['title'] = array( '#type' => 'link', diff --git a/core/modules/node/node.module b/core/modules/node/node.module index 3ed851862d0c5bb8a594b965a5ebbea39a0b31d1..73f5dcade5ae7a8a20985cf52f7478baaa0816eb 100644 --- a/core/modules/node/node.module +++ b/core/modules/node/node.module @@ -1938,7 +1938,7 @@ function theme_node_recent_content($variables) { $output .= l($node->label(), 'node/' . $node->nid); $mark = array( '#theme' => 'mark', - '#type' => node_mark($node->nid, $node->changed), + '#mark_type' => node_mark($node->nid, $node->changed), ); $output .= drupal_render($mark); $output .= '</div><div class="node-author">'; diff --git a/core/modules/tracker/tracker.pages.inc b/core/modules/tracker/tracker.pages.inc index 7d601e4500aac798b7074baeb8a9bb7e37ac3782..d33e1f32b5a5c24f6cb93110a967f84b6bd57282 100644 --- a/core/modules/tracker/tracker.pages.inc +++ b/core/modules/tracker/tracker.pages.inc @@ -76,7 +76,7 @@ function tracker_page($account = NULL, $set_title = FALSE) { $mark_build = array( '#theme' => 'mark', - '#type' => node_mark($node->nid, $node->changed), + '#mark_type' => node_mark($node->nid, $node->changed), ); $row = array(