diff options
Diffstat (limited to 'includes')
-rw-r--r-- | includes/common.inc | 8 | ||||
-rw-r--r-- | includes/database.inc | 2 |
2 files changed, 5 insertions, 5 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])) { diff --git a/includes/database.inc b/includes/database.inc index 95e09feb5..8b19e8de4 100644 --- a/includes/database.inc +++ b/includes/database.inc @@ -331,7 +331,7 @@ function db_escape_table($string) { * * A Drupal schema definition is an array structure representing one or * more tables and their related keys and indexes. A schema is defined by - * hook_schema(), which usually lives in a modulename.schema file. + * hook_schema(), which usually lives in a modulename.install file. * * By implementing hook_schema() and specifying the tables your module * declares, you can easily create and drop these tables on all |