diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-09-24 21:20:31 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-09-24 21:20:31 +0000 |
| commit | b6d73970aeb8d1921bf5d880cacc7c05e16e7377 (patch) | |
| tree | 666fc2ad2472f583187b36ec6ef8548d85f9392c | |
| parent | 061ee9d44477dbbdb74dd2abdeb697d1e61bde25 (diff) | |
| download | brdo-b6d73970aeb8d1921bf5d880cacc7c05e16e7377.tar.gz brdo-b6d73970aeb8d1921bf5d880cacc7c05e16e7377.tar.bz2 | |
#898584 by Damien Tournoud, ksenzee, chx: Clean-up the upgrade path: system.
| -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 ab45effe2..7a5230aee 100644 --- a/modules/system/system.install +++ b/modules/system/system.install @@ -2060,13 +2060,15 @@ function system_update_7016() { * Change the theme setting 'toggle_node_info' into a per content type variable. */ function system_update_7017() { - $types = node_type_get_types(); - if (count($types)) { - foreach ($types as $type) { - $node_info = theme_get_setting('toggle_node_info_' . $type->type); - if ($node_info !== NULL) { - variable_set('node_submitted_' . $type->type, $node_info); - } + // Get the global theme settings. + $settings = variable_get('theme_settings', array()); + // Get the settings of the default theme. + $settings = array_merge($settings, variable_get('theme_' . variable_get('theme_default', 'garland') . '_settings', array())); + + $types = _update_7000_node_get_types(); + foreach ($types as $type) { + if (isset($settings['toggle_node_info_' . $type->type])) { + variable_set('node_submitted_' . $type->type, $settings['toggle_node_info_' . $type->type]); } } |