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

Issue #2106097 by ianmthomasuk: Fixed Finish converting menu_default_active_menus() to CMI.

8.0.x
Nathaniel Catchpole 2013-10-09 11:26:58 +01:00
parent 9d5d866f06
commit 164ac6d0d4
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/modules/menu/menu.module
View File

@ -209,12 +209,16 @@ function menu_menu_predelete(Menu $menu) {
menu_delete_links($menu->id());
// Remove menu from active menus variable.
$active_menus = variable_get('menu_default_active_menus', array_keys(menu_get_menus()));
foreach ($active_menus as $i => $menu_name) {
if ($menu->id() == $menu_name) {
unset($active_menus[$i]);
variable_set('menu_default_active_menus', $active_menus);
}
$config = \Drupal::config('system.menu');
$active_menus = $config->get('active_menus_default') ?: array_keys(menu_get_menus());
if (in_array($menu->id(), $active_menus)) {
$active_menus = array_diff($active_menus, array($menu->id()));
// Prevent the gap left by the removed menu from causing array indices to
// be saved.
$active_menus = array_values($active_menus);
$config
->set('active_menus_default', $active_menus)
->save();
}
}

2
core/modules/system/system.install
View File

@ -1765,7 +1765,7 @@ function system_update_8032() {
*/
function system_update_8033() {
update_variables_to_config('system.menu', array(
'active_menus_default' => 'active_menus_default'
'menu_default_active_menus' => 'active_menus_default'
));
}