diff options
| author | Dries Buytaert <dries@buytaert.net> | 2010-06-03 13:20:05 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2010-06-03 13:20:05 +0000 |
| commit | 79bf3bb31be87aca9099f16d6ab791e0530dc74a (patch) | |
| tree | e275b8270781f3802e7465f80521dd3df247c116 /modules/system/system.install | |
| parent | 8ac69af008f168954fdd0a542716db6c22ba52a5 (diff) | |
| download | brdo-79bf3bb31be87aca9099f16d6ab791e0530dc74a.tar.gz brdo-79bf3bb31be87aca9099f16d6ab791e0530dc74a.tar.bz2 | |
- Patch #815734 by catch: system_update_7053() assumes block module is installed.
Diffstat (limited to 'modules/system/system.install')
| -rw-r--r-- | modules/system/system.install | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/modules/system/system.install b/modules/system/system.install index 993bb4981..06fb1009f 100644 --- a/modules/system/system.install +++ b/modules/system/system.install @@ -2362,11 +2362,13 @@ function system_update_7052() { */ function system_update_7053() { // Navigation block is now defined in system module. - db_update('block') - ->fields(array('module' => 'system')) - ->condition('module', 'user') - ->condition('delta', 'navigation') - ->execute(); + if (db_table_exists('block')) { + db_update('block') + ->fields(array('module' => 'system')) + ->condition('module', 'user') + ->condition('delta', 'navigation') + ->execute(); + } // Create the same menus as in menu_install(). db_insert('menu_custom') |