Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
D
drupal
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Custom Issue Tracker
Custom Issue Tracker
Labels
Merge Requests
316
Merge Requests
316
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Analytics
Analytics
Code Review
Insights
Issue
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
project
drupal
Commits
4e91408d
Commit
4e91408d
authored
Jun 15, 2009
by
Dries
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Patch
#491666
by chx: the cruft police stop by.
parent
529713d8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
30 deletions
+21
-30
modules/aggregator/aggregator.pages.inc
modules/aggregator/aggregator.pages.inc
+5
-7
modules/user/user.admin.inc
modules/user/user.admin.inc
+16
-23
No files found.
modules/aggregator/aggregator.pages.inc
View file @
4e91408d
...
...
@@ -238,14 +238,12 @@ function aggregator_categorize_items_submit($form, &$form_state) {
function
theme_aggregator_categorize_items
(
$form
)
{
$output
=
drupal_render
(
$form
[
'feed_source'
]);
$rows
=
array
();
if
(
$form
[
'items'
]
)
{
if
(
!
empty
(
$form
[
'items'
])
)
{
foreach
(
element_children
(
$form
[
'items'
])
as
$key
)
{
if
(
is_array
(
$form
[
'items'
][
$key
]))
{
$rows
[]
=
array
(
drupal_render
(
$form
[
'items'
][
$key
]),
array
(
'data'
=>
drupal_render
(
$form
[
'categories'
][
$key
]),
'class'
=>
'categorize-item'
),
);
}
$rows
[]
=
array
(
drupal_render
(
$form
[
'items'
][
$key
]),
array
(
'data'
=>
drupal_render
(
$form
[
'categories'
][
$key
]),
'class'
=>
'categorize-item'
),
);
}
}
$output
.
=
theme
(
'table'
,
array
(
''
,
t
(
'Categorize'
)),
$rows
);
...
...
modules/user/user.admin.inc
View file @
4e91408d
...
...
@@ -678,33 +678,26 @@ function user_admin_perm_submit($form, &$form_state) {
function
theme_user_admin_perm
(
$form
)
{
$roles
=
user_roles
();
foreach
(
element_children
(
$form
[
'permission'
])
as
$key
)
{
// Don't take form control structures
if
(
is_array
(
$form
[
'permission'
][
$key
]))
{
$row
=
array
();
// Module name
if
(
is_numeric
(
$key
))
{
$row
[]
=
array
(
'data'
=>
drupal_render
(
$form
[
'permission'
][
$key
]),
'class'
=>
'module'
,
'id'
=>
'module-'
.
$form
[
'permission'
][
$key
][
'#id'
],
'colspan'
=>
count
(
$form
[
'role_names'
][
'#value'
])
+
1
);
}
else
{
// Permission row.
$row
[]
=
array
(
'data'
=>
drupal_render
(
$form
[
'permission'
][
$key
]),
'class'
=>
'permission'
,
);
foreach
(
element_children
(
$form
[
'checkboxes'
])
as
$rid
)
{
if
(
is_array
(
$form
[
'checkboxes'
][
$rid
]))
{
$row
[]
=
array
(
'data'
=>
drupal_render
(
$form
[
'checkboxes'
][
$rid
][
$key
]),
'class'
=>
'checkbox'
,
'title'
=>
$roles
[
$rid
]
.
' : '
.
t
(
$key
));
}
}
$row
=
array
();
// Module name
if
(
is_numeric
(
$key
))
{
$row
[]
=
array
(
'data'
=>
drupal_render
(
$form
[
'permission'
][
$key
]),
'class'
=>
'module'
,
'id'
=>
'module-'
.
$form
[
'permission'
][
$key
][
'#id'
],
'colspan'
=>
count
(
$form
[
'role_names'
][
'#value'
])
+
1
);
}
else
{
// Permission row.
$row
[]
=
array
(
'data'
=>
drupal_render
(
$form
[
'permission'
][
$key
]),
'class'
=>
'permission'
,
);
foreach
(
element_children
(
$form
[
'checkboxes'
])
as
$rid
)
{
$row
[]
=
array
(
'data'
=>
drupal_render
(
$form
[
'checkboxes'
][
$rid
][
$key
]),
'class'
=>
'checkbox'
,
'title'
=>
$roles
[
$rid
]
.
' : '
.
t
(
$key
));
}
$rows
[]
=
$row
;
}
$rows
[]
=
$row
;
}
$header
[]
=
(
t
(
'Permission'
));
foreach
(
element_children
(
$form
[
'role_names'
])
as
$rid
)
{
if
(
is_array
(
$form
[
'role_names'
][
$rid
]))
{
$header
[]
=
array
(
'data'
=>
drupal_render
(
$form
[
'role_names'
][
$rid
]),
'class'
=>
'checkbox'
);
}
$header
[]
=
array
(
'data'
=>
drupal_render
(
$form
[
'role_names'
][
$rid
]),
'class'
=>
'checkbox'
);
}
$output
=
theme
(
'system_compact_link'
);
$output
.
=
theme
(
'table'
,
$header
,
$rows
,
array
(
'id'
=>
'permissions'
));
...
...
@@ -835,7 +828,7 @@ function theme_user_admin_account($form) {
);
$output
=
drupal_render
(
$form
[
'options'
]);
if
(
isset
(
$form
[
'name'
])
&&
is_arra
y
(
$form
[
'name'
]))
{
if
(
!
empt
y
(
$form
[
'name'
]))
{
foreach
(
element_children
(
$form
[
'name'
])
as
$key
)
{
$rows
[]
=
array
(
drupal_render
(
$form
[
'accounts'
][
$key
]),
...
...
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