diff options
| author | Dries Buytaert <dries@buytaert.net> | 2009-04-21 09:31:31 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2009-04-21 09:31:31 +0000 |
| commit | 3fbda2307d765dde813a8cf09a01f04cd9b65ca1 (patch) | |
| tree | ca9fd1435592944e4ede208c16578444ed92b906 /modules/menu | |
| parent | a7c324f42c942eb7728639ec1a58e78134d46eb1 (diff) | |
| download | brdo-3fbda2307d765dde813a8cf09a01f04cd9b65ca1.tar.gz brdo-3fbda2307d765dde813a8cf09a01f04cd9b65ca1.tar.bz2 | |
- Patch #375482 by mfb: avoid PDO exceptions when block module is not enabled.
Diffstat (limited to 'modules/menu')
| -rw-r--r-- | modules/menu/menu.admin.inc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/modules/menu/menu.admin.inc b/modules/menu/menu.admin.inc index 37229cde9..4fcbb9c21 100644 --- a/modules/menu/menu.admin.inc +++ b/modules/menu/menu.admin.inc @@ -510,8 +510,10 @@ function menu_delete_menu_confirm_submit($form, &$form_state) { db_query("DELETE FROM {menu_links} WHERE menu_name = '%s'", $menu['menu_name']); db_query("DELETE FROM {menu_custom} WHERE menu_name = '%s'", $menu['menu_name']); // Delete all the blocks for this menu. - db_query("DELETE FROM {block} WHERE module = 'menu' AND delta = '%s'", $menu['menu_name']); - db_query("DELETE FROM {block_role} WHERE module = 'menu' AND delta = '%s'", $menu['menu_name']); + if (module_exists('block')) { + db_query("DELETE FROM {block} WHERE module = 'menu' AND delta = '%s'", $menu['menu_name']); + db_query("DELETE FROM {block_role} WHERE module = 'menu' AND delta = '%s'", $menu['menu_name']); + } menu_cache_clear_all(); cache_clear_all(); $t_args = array('%title' => $menu['title']); |