diff options
-rw-r--r-- | update.php | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/update.php b/update.php index f81bfc308..fb07f0458 100644 --- a/update.php +++ b/update.php @@ -439,9 +439,13 @@ function update_do_updates() { $percentage = 100; } - // When no updates remain, clear the cache. + // When no updates remain, clear the caches in case the data has been updated. if (!isset($update['module'])) { - db_query('DELETE FROM {cache}'); + cache_clear_all('*', 'cache', TRUE); + cache_clear_all('*', 'cache_page', TRUE); + cache_clear_all('*', 'cache_menu', TRUE); + cache_clear_all('*', 'cache_filter', TRUE); + drupal_clear_css_cache(); } return array($percentage, isset($update['module']) ? 'Updating '. $update['module'] .' module' : 'Updating complete'); @@ -785,9 +789,6 @@ if (($access_check == FALSE) || ($user->uid == 1)) { update_fix_watchdog(); update_fix_sessions(); - // Clear any cached CSS files, in case any module updates its CSS as well. - drupal_clear_css_cache(); - $op = isset($_REQUEST['op']) ? $_REQUEST['op'] : ''; switch ($op) { case 'Update': |