diff options
| author | Dries Buytaert <dries@buytaert.net> | 2010-04-22 18:56:53 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2010-04-22 18:56:53 +0000 |
| commit | 6d9fb62fcfdac43ef5ec32ba3fc288dafe5b79b6 (patch) | |
| tree | 1105c746c0de612af1d4e208516cd8f343081ca4 /includes | |
| parent | 7d9c1dd7e636f038017b033d3005c93cf7d6592a (diff) | |
| download | brdo-6d9fb62fcfdac43ef5ec32ba3fc288dafe5b79b6.tar.gz brdo-6d9fb62fcfdac43ef5ec32ba3fc288dafe5b79b6.tar.bz2 | |
- Patch #731606 by fago: module_implements() fails to find include.
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/module.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/module.inc b/includes/module.inc index ae132fa5b..dcaf2f567 100644 --- a/includes/module.inc +++ b/includes/module.inc @@ -589,8 +589,8 @@ function module_implements($hook, $sort = FALSE, $reset = FALSE) { $implementations[$hook] = array(); $list = module_list(FALSE, FALSE, $sort); foreach ($list as $module) { - $include_file = FALSE; - if (module_hook($module, $hook) || (isset($hook_info[$hook]['group']) && $include_file = module_load_include('inc', $module, $module . '.' . $hook_info[$hook]['group']) && module_hook($module, $hook))) { + $include_file = isset($hook_info[$hook]['group']) && module_load_include('inc', $module, $module . '.' . $hook_info[$hook]['group']); + if (module_hook($module, $hook)) { $implementations[$hook][$module] = $include_file ? $hook_info[$hook]['group'] : FALSE; // We added something to the cache, so write it when we are done. $implementations['#write_cache'] = TRUE; |