Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
project
drupal
Commits
f45ae901
Commit
f45ae901
authored
Jun 11, 2013
by
alexpott
Browse files
Issue
#2010672
by Cottser, thedavidmeister: Rename 'type' variable of theme_mark() to 'mark_type'.
parent
25e8e633
Changes
5
Hide whitespace changes
Inline
Side-by-side
core/includes/theme.inc
View file @
f45ae901
...
...
@@ -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
View file @
f45ae901
...
...
@@ -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
View file @
f45ae901
...
...
@@ -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
View file @
f45ae901
...
...
@@ -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
View file @
f45ae901
...
...
@@ -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
(
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment