From f45ae901c93f03387160f60067768b7188fe3178 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Tue, 11 Jun 2013 17:35:45 +0100
Subject: [PATCH] Issue #2010672 by Cottser, thedavidmeister: Rename 'type'
variable of theme_mark() to 'mark_type'.
---
core/includes/theme.inc | 4 ++--
.../history/Plugin/views/field/HistoryUserTimestamp.php | 2 +-
core/modules/node/node.admin.inc | 2 +-
core/modules/node/node.module | 2 +-
core/modules/tracker/tracker.pages.inc | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/core/includes/theme.inc b/core/includes/theme.inc
index 1d72f44c1c68..78bc8d5cf9f6 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 4465dacdd65f..fbd6b0bca0e5 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 88358616f252..47ff29311a77 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 3ed851862d0c..73f5dcade5ae 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 7d601e4500aa..d33e1f32b5a5 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(
--
GitLab