summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorGábor Hojtsy <gabor@hojtsy.hu>2007-12-12 14:54:27 +0000
committerGábor Hojtsy <gabor@hojtsy.hu>2007-12-12 14:54:27 +0000
commit2325fd5105462d8f3403c5aaf382d633f77cd373 (patch)
treea0a67029a553b27716c1d586ff4a75b253a43057 /includes
parent96668d576cce83ee8082e186149c4504c75c3a2d (diff)
downloadbrdo-2325fd5105462d8f3403c5aaf382d633f77cd373.tar.gz
brdo-2325fd5105462d8f3403c5aaf382d633f77cd373.tar.bz2
#199654 by yched: stale schema cache was used when a schema cache refresh was requested
Diffstat (limited to 'includes')
-rw-r--r--includes/common.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/includes/common.inc b/includes/common.inc
index 9eb381a6a..fdf7dc2f0 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -3193,6 +3193,7 @@ function drupal_get_schema($name = NULL, $rebuild = FALSE) {
}
// Otherwise, rebuild the schema cache.
else {
+ $schema = array();
// Load the .install files to get hook_schema.
module_load_all_includes('install');
@@ -3200,7 +3201,7 @@ function drupal_get_schema($name = NULL, $rebuild = FALSE) {
foreach (module_implements('schema') as $module) {
$current = module_invoke($module, 'schema');
_drupal_initialize_schema($module, $current);
- $schema = array_merge($current, $schema);
+ $schema = array_merge($schema, $current);
}
drupal_alter('schema', $schema);