diff options
| author | Dries Buytaert <dries@buytaert.net> | 2010-06-23 13:17:51 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2010-06-23 13:17:51 +0000 |
| commit | a3af546fe4772179bf8d650d1e3475640fa2ffb6 (patch) | |
| tree | 6a6e95b54f8c4d915aa35f375130ef9bd38f4b00 /modules/system/system.install | |
| parent | c28bba827e0c62ab92062c1e0cc0490ff50079fe (diff) | |
| download | brdo-a3af546fe4772179bf8d650d1e3475640fa2ffb6.tar.gz brdo-a3af546fe4772179bf8d650d1e3475640fa2ffb6.tar.bz2 | |
- Patch #831732 by solotandem: system_update_7053 needs to check for existence of menu_custom() table.
Diffstat (limited to 'modules/system/system.install')
| -rw-r--r-- | modules/system/system.install | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/modules/system/system.install b/modules/system/system.install index 434787605..51b54af70 100644 --- a/modules/system/system.install +++ b/modules/system/system.install @@ -2384,14 +2384,16 @@ function system_update_7053() { ->execute(); } - // Create the same menus as in menu_install(). - db_insert('menu_custom') - ->fields(array('menu_name' => 'user-menu', 'title' => 'User Menu', 'description' => "The <em>User</em> menu contains links related to the user's account, as well as the 'Log out' link.")) - ->execute(); + if (db_table_exists('menu_custom')) { + // Create the same menus as in menu_install(). + db_insert('menu_custom') + ->fields(array('menu_name' => 'user-menu', 'title' => 'User Menu', 'description' => "The <em>User</em> menu contains links related to the user's account, as well as the 'Log out' link.")) + ->execute(); - db_insert('menu_custom') - ->fields(array('menu_name' => 'management', 'title' => 'Management', 'description' => "The <em>Management</em> menu contains links for administrative tasks.")) - ->execute(); + db_insert('menu_custom') + ->fields(array('menu_name' => 'management', 'title' => 'Management', 'description' => "The <em>Management</em> menu contains links for administrative tasks.")) + ->execute(); + } } /** |