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

#561452 follow-up by David_Rothstein: Use helper functions rather than file scans to retrieve module data on permissions page.

merge-requests/26/head
Angie Byron 2009-10-27 04:08:42 +00:00
parent 9ad53c524a
commit ca7b56e735
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/system/system.updater.inc
View File

@ -117,7 +117,7 @@ class ThemeUpdater extends Updater implements DrupalUpdaterInterface {
public function postInstall() { public function postInstall() {
// Update the system table. // Update the system table.
clearstatcache(); clearstatcache();
drupal_static_reset('_system_get_theme_data'); drupal_static_reset('_system_rebuild_theme_data');
_system_rebuild_theme_data(); _system_rebuild_theme_data();
// Active the theme // Active the theme

4
modules/user/user.admin.inc
View File

@ -650,12 +650,12 @@ function user_admin_permissions($form, $form_state, $rid = NULL) {
); );
// Render role/permission overview: // Render role/permission overview:
$options = array(); $options = array();
$module_info = system_get_info('module');
$hide_descriptions = !system_admin_compact_mode(); $hide_descriptions = !system_admin_compact_mode();
foreach (module_implements('permission') as $module) { foreach (module_implements('permission') as $module) {
if ($permissions = module_invoke($module, 'permission')) { if ($permissions = module_invoke($module, 'permission')) {
$info = drupal_parse_info_file(drupal_get_path('module', $module) . "/$module.info");
$form['permission'][] = array( $form['permission'][] = array(
'#markup' => $info['name'], '#markup' => $module_info[$module]['name'],
'#id' => $module, '#id' => $module,
); );
foreach ($permissions as $perm => $perm_item) { foreach ($permissions as $perm => $perm_item) {