summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorAngie Byron <webchick@24967.no-reply.drupal.org>2008-12-07 08:23:07 +0000
committerAngie Byron <webchick@24967.no-reply.drupal.org>2008-12-07 08:23:07 +0000
commitfcb68d747e6b61e79da6afe573619720ba6baf80 (patch)
treea14e3154b611b1e6b741b58e66890f4adf71ec1c /includes
parentbaa9c7e2b032d53821dd3afbec3b0293a98f1e91 (diff)
downloadbrdo-fcb68d747e6b61e79da6afe573619720ba6baf80.tar.gz
brdo-fcb68d747e6b61e79da6afe573619720ba6baf80.tar.bz2
#305653 follow-up by sun: Prevent themes from being disabled during update.
Diffstat (limited to 'includes')
-rw-r--r--includes/common.inc11
1 files changed, 10 insertions, 1 deletions
diff --git a/includes/common.inc b/includes/common.inc
index df5cb16a9..b8816147f 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -3950,7 +3950,16 @@ function drupal_flush_all_caches() {
registry_rebuild();
drupal_clear_css_cache();
drupal_clear_js_cache();
- system_theme_data();
+
+ // If invoked from update.php, we must not update the theme information in the
+ // database, or this will result in all themes being disabled.
+ if (defined('MAINTENANCE_MODE') && MAINTENANCE_MODE == 'update') {
+ _system_theme_data();
+ }
+ else {
+ system_theme_data();
+ }
+
drupal_theme_rebuild();
menu_rebuild();
node_types_rebuild();