Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
project
drupal
Commits
fb802505
Commit
fb802505
authored
Oct 06, 2010
by
Dries
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Patch
#932098
by sun: various bogus theme variables.
parent
16801036
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
17 additions
and
17 deletions
+17
-17
includes/locale.inc
includes/locale.inc
+1
-1
includes/pager.inc
includes/pager.inc
+4
-1
modules/aggregator/aggregator.pages.inc
modules/aggregator/aggregator.pages.inc
+1
-1
modules/forum/forum.module
modules/forum/forum.module
+1
-1
modules/node/node.admin.inc
modules/node/node.admin.inc
+1
-1
modules/poll/poll.pages.inc
modules/poll/poll.pages.inc
+1
-1
modules/profile/profile.pages.inc
modules/profile/profile.pages.inc
+2
-2
modules/simpletest/tests/theme.test
modules/simpletest/tests/theme.test
+1
-1
modules/system/system.admin.inc
modules/system/system.admin.inc
+1
-1
modules/system/system.install
modules/system/system.install
+1
-4
modules/taxonomy/taxonomy.admin.inc
modules/taxonomy/taxonomy.admin.inc
+1
-1
modules/taxonomy/taxonomy.pages.inc
modules/taxonomy/taxonomy.pages.inc
+1
-1
modules/user/user.admin.inc
modules/user/user.admin.inc
+1
-1
No files found.
includes/locale.inc
View file @
fb802505
...
...
@@ -1615,7 +1615,7 @@ function _locale_translate_seek() {
}
$output
.
=
theme
(
'table'
,
array
(
'header'
=>
$header
,
'rows'
=>
$rows
,
'empty'
=>
t
(
'No strings available.'
)));
$output
.
=
theme
(
'pager'
,
array
(
'tags'
=>
NULL
)
);
$output
.
=
theme
(
'pager'
);
return
$output
;
}
...
...
includes/pager.inc
View file @
fb802505
...
...
@@ -420,7 +420,10 @@ function theme_pager($variables) {
'data'
=>
$li_last
,
);
}
return
'<h2 class="element-invisible">'
.
t
(
'Pages'
)
.
'</h2>'
.
theme
(
'item_list'
,
array
(
'items'
=>
$items
,
'title'
=>
NULL
,
'type'
=>
'ul'
,
'attributes'
=>
array
(
'class'
=>
array
(
'pager'
))));
return
'<h2 class="element-invisible">'
.
t
(
'Pages'
)
.
'</h2>'
.
theme
(
'item_list'
,
array
(
'items'
=>
$items
,
'attributes'
=>
array
(
'class'
=>
array
(
'pager'
)),
));
}
}
...
...
modules/aggregator/aggregator.pages.inc
View file @
fb802505
...
...
@@ -268,7 +268,7 @@ function theme_aggregator_categorize_items($variables) {
* @see aggregator-wrapper.tpl.php
*/
function
template_preprocess_aggregator_wrapper
(
&
$variables
)
{
$variables
[
'pager'
]
=
theme
(
'pager'
,
array
(
'tags'
=>
NULL
)
);
$variables
[
'pager'
]
=
theme
(
'pager'
);
}
/**
...
...
modules/forum/forum.module
View file @
fb802505
...
...
@@ -1117,7 +1117,7 @@ function template_preprocess_forum_topic_list(&$variables) {
$variables
[
'topic_id'
]
=
$variables
[
'tid'
];
unset
(
$variables
[
'tid'
]);
$variables
[
'pager'
]
=
theme
(
'pager'
,
array
(
'tags'
=>
NULL
)
);
$variables
[
'pager'
]
=
theme
(
'pager'
);
}
/**
...
...
modules/node/node.admin.inc
View file @
fb802505
...
...
@@ -517,7 +517,7 @@ function node_admin_nodes() {
);
}
$form
[
'pager'
]
=
array
(
'#markup'
=>
theme
(
'pager'
,
array
(
'tags'
=>
NULL
)
));
$form
[
'pager'
]
=
array
(
'#markup'
=>
theme
(
'pager'
));
return
$form
;
}
...
...
modules/poll/poll.pages.inc
View file @
fb802505
...
...
@@ -42,7 +42,7 @@ function poll_page() {
$output
.
=
'<li>'
.
l
(
$node
->
title
,
"node/
$node->nid
"
)
.
' - '
.
format_plural
(
$node
->
votes
,
'1 vote'
,
'@count votes'
)
.
' - '
.
(
$node
->
active
?
t
(
'open'
)
:
t
(
'closed'
))
.
'</li>'
;
}
$output
.
=
'</ul>'
;
$output
.
=
theme
(
"
pager
"
,
array
(
'tags'
=>
NULL
)
);
$output
.
=
theme
(
'
pager
'
);
return
$output
;
}
...
...
modules/profile/profile.pages.inc
View file @
fb802505
...
...
@@ -74,7 +74,7 @@ function profile_browse() {
$content
.
=
theme
(
'profile_listing'
,
array
(
'account'
=>
$account
,
'fields'
=>
$profile
));
}
$output
=
theme
(
'profile_wrapper'
,
array
(
'content'
=>
$content
));
$output
.
=
theme
(
'pager'
,
array
(
'tags'
=>
NULL
)
);
$output
.
=
theme
(
'pager'
);
if
(
$field
->
type
==
'selection'
||
$field
->
type
==
'list'
||
$field
->
type
==
'textfield'
)
{
$title
=
strtr
(
check_plain
(
$field
->
page
),
array
(
'%value'
=>
drupal_placeholder
(
$value
)));
...
...
@@ -111,7 +111,7 @@ function profile_browse() {
$content
.
=
theme
(
'profile_listing'
,
array
(
'account'
=>
$account
,
'fields'
=>
$profile
));
}
$output
=
theme
(
'profile_wrapper'
,
array
(
'content'
=>
$content
));
$output
.
=
theme
(
'pager'
,
array
(
'tags'
=>
NULL
)
);
$output
.
=
theme
(
'pager'
);
drupal_set_title
(
t
(
'User list'
));
return
$output
;
...
...
modules/simpletest/tests/theme.test
View file @
fb802505
...
...
@@ -182,7 +182,7 @@ class ThemeItemListUnitTest extends DrupalWebTestCase {
</ul></div></li>
<li class="last">e</li>
</ul></div>'
;
$output
=
theme
(
'item_list'
,
array
(
'items'
=>
$items
,
'type'
=>
'ul'
,
'title'
=>
NULL
,
'attributes'
=>
array
()
));
$output
=
theme
(
'item_list'
,
array
(
'items'
=>
$items
));
$this
->
assertIdentical
(
$expected
,
$output
,
'Nested list is rendered correctly.'
);
}
}
...
...
modules/system/system.admin.inc
View file @
fb802505
...
...
@@ -2902,7 +2902,7 @@ function system_actions_manage() {
}
if
(
$row
)
{
$pager
=
theme
(
'pager'
,
array
(
'tags'
=>
NULL
)
);
$pager
=
theme
(
'pager'
);
if
(
!
empty
(
$pager
))
{
$row
[]
=
array
(
array
(
'data'
=>
$pager
,
'colspan'
=>
'3'
));
}
...
...
modules/system/system.install
View file @
fb802505
...
...
@@ -128,10 +128,7 @@ function system_requirements($phase) {
'@system_requirements'
=>
'http://drupal.org/requirements'
,
));
$description
.
=
theme
(
'item_list'
,
array
(
'type'
=>
'ul'
,
'items'
=>
$missing_extensions
,
));
$description
.
=
theme
(
'item_list'
,
array
(
'items'
=>
$missing_extensions
));
$requirements
[
'php_extensions'
][
'value'
]
=
$t
(
'Disabled'
);
$requirements
[
'php_extensions'
][
'severity'
]
=
REQUIREMENT_ERROR
;
...
...
modules/taxonomy/taxonomy.admin.inc
View file @
fb802505
...
...
@@ -633,7 +633,7 @@ function theme_taxonomy_overview_terms($variables) {
$header
=
array
(
t
(
'Name'
),
t
(
'Weight'
),
t
(
'Operations'
));
$output
=
theme
(
'table'
,
array
(
'header'
=>
$header
,
'rows'
=>
$rows
,
'attributes'
=>
array
(
'id'
=>
'taxonomy'
)));
$output
.
=
drupal_render_children
(
$form
);
$output
.
=
theme
(
'pager'
,
array
(
'tags'
=>
NULL
)
);
$output
.
=
theme
(
'pager'
);
return
$output
;
}
...
...
modules/taxonomy/taxonomy.pages.inc
View file @
fb802505
...
...
@@ -45,7 +45,7 @@ function taxonomy_term_page($term) {
$nodes
=
node_load_multiple
(
$nids
);
$build
+=
node_view_multiple
(
$nodes
);
$build
[
'pager'
]
=
array
(
'#markup'
=>
theme
(
'pager'
,
array
(
'tags'
=>
NULL
)
),
'#markup'
=>
theme
(
'pager'
),
'#weight'
=>
5
,
);
}
...
...
modules/user/user.admin.inc
View file @
fb802505
...
...
@@ -221,7 +221,7 @@ function user_admin_account() {
'#options'
=>
$options
,
'#empty'
=>
t
(
'No people available.'
),
);
$form
[
'pager'
]
=
array
(
'#markup'
=>
theme
(
'pager'
,
array
(
'tags'
=>
NULL
)
));
$form
[
'pager'
]
=
array
(
'#markup'
=>
theme
(
'pager'
));
return
$form
;
}
...
...
Write
Preview
Markdown
is supported
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