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

Issue #2009690 by jeroen12345, redfoxxx.ua, InternetDevels, hussainweb: Replace theme() with drupal_render() in user module.

8.0.x
Alex Pott 2013-06-18 14:09:48 +02:00
parent a2ed2bbcbf
commit 9dd08c04a1
4 changed files with 49 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/modules/user/lib/Drupal/user/Plugin/Block/UserNewBlock.php
View File

@ -72,7 +72,11 @@ class UserNewBlock extends BlockBase {
'#items' => array(),
);
foreach ($items as $account) {
$build['#items'][] = theme('username', array('account' => $account));
$username = array(
'#theme' => 'username',
'#account' => $account,
);
$build['#items'][] = drupal_render($username);
}
return $build;
}

6
core/modules/user/lib/Drupal/user/Plugin/Block/UserOnlineBlock.php
View File

@ -95,7 +95,11 @@ class UserOnlineBlock extends BlockBase {
if ($authenticated_count && $max_users) {
$uids = db_query_range('SELECT uid FROM {users} WHERE access >= :interval AND uid > 0 ORDER BY access DESC', 0, $max_users, array(':interval' => $interval))->fetchCol();
foreach (user_load_multiple($uids) as $account) {
$build['#items'][] = theme('username', array('account' => $account));
$username = array(
'#theme' => 'username',
'#account' => $account,
);
$build['#items'][] = drupal_render($username);
}
}

6
core/modules/user/lib/Drupal/user/Plugin/views/field/Name.php
View File

@ -85,7 +85,11 @@ class Name extends User {
}
elseif (!empty($this->options['link_to_user'])) {
$account->name = $this->getValue($values);
return theme('username', array('account' => $account));
$username = array(
'#theme' => 'username',
'#account' => $account,
);
return drupal_render($username);
}
}
// If we want a formatted username, do that.

43
core/modules/user/user.admin.inc
View File

@ -47,13 +47,20 @@ function user_admin_account() {
$users_roles[] = $roles[$user_role->rid];
}
asort($users_roles);
$username = array(
'#theme' => 'username',
'#account' => $account,
);
$item_list = array(
'#theme' => 'item_list',
'#items' => $users_roles,
);
$options[$account->uid] = array(
'username' => theme('username', array('account' => $account)),
'status' => $status[$account->status],
'roles' => theme('item_list', array('items' => $users_roles)),
'username' => drupal_render($username),
'status' => $status[$account->status],
'roles' => drupal_render($item_list),
'member_for' => format_interval(REQUEST_TIME - $account->created),
'access' => $account->access ? t('@time ago', array('@time' => format_interval(REQUEST_TIME - $account->access))) : t('never'),
'access' => $account->access ? t('@time ago', array('@time' => format_interval(REQUEST_TIME - $account->access))) : t('never'),
);
$links = array();
$links['edit'] = array(
@ -83,7 +90,9 @@ function user_admin_account() {
'#rows' => $options,
'#empty' => t('No people available.'),
);
$form['pager'] = array('#markup' => theme('pager'));
$form['pager'] = array(
'#theme' =>'pager',
);
return $form;
}
@ -137,10 +146,15 @@ function user_admin_permissions($form, $form_state, $rid = NULL) {
'warning' => !empty($perm_item['restrict access']) ? t('Warning: Give to trusted roles only; this permission has security implications.') : '',
);
$options[$perm] = '';
$user_permission_description = array(
'#theme' => 'user_permission_description',
'#permission_item' => $perm_item,
'#hide' => $hide_descriptions,
);
$form['permission'][$perm] = array(
'#type' => 'item',
'#markup' => $perm_item['title'],
'#description' => theme('user_permission_description', array('permission_item' => $perm_item, 'hide' => $hide_descriptions)),
'#description' => drupal_render($user_permission_description),
);
foreach ($role_names as $rid => $name) {
// Builds arrays for checked boxes for each role
@ -224,8 +238,19 @@ function theme_user_admin_permissions($variables) {
foreach (element_children($form['role_names']) as $rid) {
$header[] = array('data' => drupal_render($form['role_names'][$rid]), 'class' => array('checkbox'));
}
$output = theme('system_compact_link');
$output .= theme('table', array('header' => $header, 'rows' => $rows, 'attributes' => array('id' => 'permissions')));
$system_compact_link = array(
'#theme' => 'system_compact_link',
);
$table = array(
'#theme' => 'table',
'#header' => $header,
'#rows' => $rows,
'#attributes' => array(
'id' => 'permissions',
),
);
$output = drupal_render($system_compact_link);
$output .= drupal_render($table);
$output .= drupal_render_children($form);
return $output;
}