diff options
author | Dries Buytaert <dries@buytaert.net> | 2007-10-05 14:43:26 +0000 |
---|---|---|
committer | Dries Buytaert <dries@buytaert.net> | 2007-10-05 14:43:26 +0000 |
commit | 39706e3c51cf206ca6669bbb7a090d2f7d394591 (patch) | |
tree | 9286ccd302d526ea8a1de799081356fcc77c28a3 /includes/common.inc | |
parent | d568128b9f7a0181b31e9baa087022e892352ea7 (diff) | |
download | brdo-39706e3c51cf206ca6669bbb7a090d2f7d394591.tar.gz brdo-39706e3c51cf206ca6669bbb7a090d2f7d394591.tar.bz2 |
- Patch #150245 by webchick, bjaspan, ralf, Arancaytar et al: move the .schema files into .install files to prevent mistakes.
Diffstat (limited to 'includes/common.inc')
-rw-r--r-- | includes/common.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/includes/common.inc b/includes/common.inc index 5baafa8b3..1d53d8736 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -2869,8 +2869,8 @@ function drupal_get_schema($name = NULL, $rebuild = FALSE) { } // Otherwise, rebuild the schema cache. else { - // Load the .schema files. - module_load_all_includes('schema'); + // Load the .install files to get hook_schema. + module_load_all_includes('install'); // Invoke hook_schema for all modules. foreach (module_implements('schema') as $module) { @@ -2960,8 +2960,8 @@ function drupal_uninstall_schema($module) { * is returned. */ function drupal_get_schema_unprocessed($module, $table = NULL) { - // Load the .schema file. - module_load_include('schema', $module); + // Load the .install file to get hook_schema. + module_load_include('install', $module); $schema = module_invoke($module, 'schema'); if (!is_null($table) && isset($schema[$table])) { |