Issue #2010672 by Cottser, thedavidmeister: Rename 'type' variable of theme_mark() to 'mark_type'.

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()),

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);
     }
   }
 

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',

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">';

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(