Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

8.0.x
Alex Pott 2013-06-11 17:35:45 +01:00
parent 25e8e63355
commit f45ae901c9
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/includes/theme.inc
View File

@ -2275,7 +2275,7 @@ function theme_tablesort_indicator($variables) {
* MARK_UPDATED, MARK_READ. * MARK_UPDATED, MARK_READ.
*/ */
function theme_mark($variables) { function theme_mark($variables) {
$type = $variables['type']; $type = $variables['mark_type'];
global $user; global $user;
if ($user->uid) { if ($user->uid) {
if ($type == MARK_NEW) { if ($type == MARK_NEW) {
@ -3172,7 +3172,7 @@ function drupal_common_theme() {
'variables' => array('style' => NULL), 'variables' => array('style' => NULL),
), ),
'mark' => array( 'mark' => array(
'variables' => array('type' => MARK_NEW), 'variables' => array('mark_type' => MARK_NEW),
), ),
'item_list' => array( 'item_list' => array(
'variables' => array('items' => array(), 'title' => '', 'type' => 'ul', 'attributes' => array()), 'variables' => array('items' => array(), 'title' => '', 'type' => 'ul', 'attributes' => array()),

2
core/modules/history/lib/Drupal/history/Plugin/views/field/HistoryUserTimestamp.php
View File

@ -90,7 +90,7 @@ class HistoryUserTimestamp extends Node {
elseif ($last_comment > $last_read && $last_comment > HISTORY_READ_LIMIT) { elseif ($last_comment > $last_read && $last_comment > HISTORY_READ_LIMIT) {
$mark = MARK_UPDATED; $mark = MARK_UPDATED;
} }
return $this->render_link(theme('mark', array('type' => $mark)), $values); return $this->render_link(theme('mark', array('mark_type' => $mark)), $values);
} }
} }

2
core/modules/node/node.admin.inc
View File

@ -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(); $l_options = $node->langcode != Language::LANGCODE_NOT_SPECIFIED && isset($languages[$node->langcode]) ? array('language' => $languages[$node->langcode]) : array();
$mark = array( $mark = array(
'#theme' => 'mark', '#theme' => 'mark',
'#type' => node_mark($node->nid, $node->changed), '#mark_type' => node_mark($node->nid, $node->changed),
); );
$form['nodes'][$node->nid]['title'] = array( $form['nodes'][$node->nid]['title'] = array(
'#type' => 'link', '#type' => 'link',

2
core/modules/node/node.module
View File

@ -1938,7 +1938,7 @@ function theme_node_recent_content($variables) {
$output .= l($node->label(), 'node/' . $node->nid); $output .= l($node->label(), 'node/' . $node->nid);
$mark = array( $mark = array(
'#theme' => 'mark', '#theme' => 'mark',
'#type' => node_mark($node->nid, $node->changed), '#mark_type' => node_mark($node->nid, $node->changed),
); );
$output .= drupal_render($mark); $output .= drupal_render($mark);
$output .= '</div><div class="node-author">'; $output .= '</div><div class="node-author">';

2
core/modules/tracker/tracker.pages.inc
View File

@ -76,7 +76,7 @@ function tracker_page($account = NULL, $set_title = FALSE) {
$mark_build = array( $mark_build = array(
'#theme' => 'mark', '#theme' => 'mark',
'#type' => node_mark($node->nid, $node->changed), '#mark_type' => node_mark($node->nid, $node->changed),
); );
$row = array( $row = array(