Commit 85fc9401 authored by Dries's avatar Dries
Browse files

- Patch #669510 by David_Rothstein: upgrade path improvements for the...

- Patch #669510 by David_Rothstein: upgrade path improvements for the administration theme setting/permission.
parent ea6242d5
...@@ -2940,14 +2940,27 @@ function system_update_7066() { ...@@ -2940,14 +2940,27 @@ function system_update_7066() {
} }
/** /**
* Allow all users to view the administration theme. * Grant administrators permission to view the administration theme.
*/ */
function system_update_7067() { function system_update_7067() {
// Preserve the site's current behavior of automatically allowing all users // Users with access to administration pages already see the administration
// to view the administration theme whenever they have access to an // theme in some places (if one is enabled on the site), so we want them to
// administrative page. // continue seeing it.
user_role_grant_permissions(DRUPAL_ANONYMOUS_RID, array('view the administration theme')); $admin_roles = user_roles(FALSE, 'access administration pages');
user_role_grant_permissions(DRUPAL_AUTHENTICATED_RID, array('view the administration theme')); foreach (array_keys($admin_roles) as $rid) {
_update_7000_user_role_grant_permissions($rid, array('view the administration theme'), 'system');
}
// The above check is not guaranteed to reach all administrative users of the
// site, so if the site is currently using an administration theme, display a
// message also.
if (variable_get('admin_theme')) {
if (empty($admin_roles)) {
drupal_set_message('The new "View the administration theme" permission is required in order to view your site\'s administration theme. You can grant this permission to your site\'s administrators on the <a href="' . url('admin/people/permissions', array('fragment' => 'module-system')) . '">permissions page</a>.');
}
else {
drupal_set_message('The new "View the administration theme" permission is required in order to view your site\'s administration theme. This permission has been automatically granted to the following roles: <em>' . check_plain(implode(', ', $admin_roles)) . '</em>. You can grant this permission to other roles on the <a href="' . url('admin/people/permissions', array('fragment' => 'module-system')) . '">permissions page</a>.');
}
}
} }
/** /**
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment