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

Update administrative theme switching to use the request rather than the legacy current_path().

8.0.x
Jody Hamilton 2012-04-11 16:07:11 -04:00 committed by Larry Garfield
parent 9d4d6b05e5
commit 25ea4a1f4a
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/modules/system/system.module
View File

@ -1973,8 +1973,11 @@ function system_add_module_assets() {
* Implements hook_custom_theme(). * Implements hook_custom_theme().
*/ */
function system_custom_theme() { function system_custom_theme() {
if (user_access('view the administration theme') && path_is_admin(current_path())) { if ($request = request()) {
return variable_get('admin_theme'); $path = ltrim($request->getPathInfo(), '/');
if (user_access('view the administration theme') && path_is_admin($path)) {
return variable_get('admin_theme');
}
} }
} }