Commit 267c290c authored by webchick's avatar webchick

#287647 by mikejoconnor, lilou, cafuego, bjaspan, and robertDouglass: Cast...

#287647 by mikejoconnor, lilou, cafuego, bjaspan, and robertDouglass: Cast results of hook_schema() to an array to avoid schema corruption.
parent 14c1c505
......@@ -1840,7 +1840,10 @@ function drupal_get_schema($table = NULL, $rebuild = FALSE) {
require_once DRUPAL_ROOT . '/includes/common.inc';
// Invoke hook_schema for all modules.
foreach (module_implements('schema') as $module) {
$current = module_invoke($module, 'schema');
// Cast the result of hook_schema() to an array, as a NULL return value
// would cause array_merge() to set the $schema variable to NULL as well.
// That would break modules which use $schema further down the line.
$current = (array) module_invoke($module, 'schema');
_drupal_schema_initialize($module, $current);
$schema = array_merge($schema, $current);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment