diff options
| author | webchick <webchick@24967.no-reply.drupal.org> | 2012-02-28 10:22:59 -0800 |
|---|---|---|
| committer | webchick <webchick@24967.no-reply.drupal.org> | 2012-02-28 10:22:59 -0800 |
| commit | 447d6a628bde3891a4be70a3d9131023214d00f3 (patch) | |
| tree | a209c0e5047eb9a8b7e1bfd9cff4cd989a5a1162 /includes/theme.inc | |
| parent | 22135d9c0c7751ac45596c947b4918041a79eeb5 (diff) | |
| download | brdo-447d6a628bde3891a4be70a3d9131023214d00f3.tar.gz brdo-447d6a628bde3891a4be70a3d9131023214d00f3.tar.bz2 | |
Issue #1430300 by mradcliffe, xjm, effulgentsia, NROTC_Webmaster: Fixed Preprocess functions in an include file fail to get called when the theme implements a suggestion override.
Diffstat (limited to 'includes/theme.inc')
| -rw-r--r-- | includes/theme.inc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/includes/theme.inc b/includes/theme.inc index da4200e56..0712f8797 100644 --- a/includes/theme.inc +++ b/includes/theme.inc @@ -991,6 +991,13 @@ function theme($hook, $variables = array()) { if (isset($info['base hook'])) { $base_hook = $info['base hook']; $base_hook_info = $hooks[$base_hook]; + // Include files required by the base hook, since its variable processors + // might reside there. + if (!empty($base_hook_info['includes'])) { + foreach ($base_hook_info['includes'] as $include_file) { + include_once DRUPAL_ROOT . '/' . $include_file; + } + } if (isset($base_hook_info['preprocess functions']) || isset($base_hook_info['process functions'])) { $variables['theme_hook_suggestion'] = $hook; $hook = $base_hook; |