diff options
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/theme.inc | 7 | ||||
| -rw-r--r-- | includes/unicode.inc | 2 |
2 files changed, 8 insertions, 1 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; diff --git a/includes/unicode.inc b/includes/unicode.inc index 9dde2ca70..cd9cd9bf0 100644 --- a/includes/unicode.inc +++ b/includes/unicode.inc @@ -73,7 +73,7 @@ define('PREG_CLASS_UNICODE_WORD_BOUNDARY', '\x{A836}-\x{A839}\x{A874}-\x{A877}\x{A8CE}-\x{A8CF}\x{A8F8}-\x{A8FA}' . '\x{A92E}-\x{A92F}\x{A95F}\x{A9C1}-\x{A9CD}\x{A9DE}-\x{A9DF}' . '\x{AA5C}-\x{AA5F}\x{AA77}-\x{AA79}\x{AADE}-\x{AADF}\x{ABEB}' . - '\x{D800}-\x{F8FF}\x{FB29}\x{FD3E}-\x{FD3F}\x{FDFC}-\x{FDFD}' . + '\x{E000}-\x{F8FF}\x{FB29}\x{FD3E}-\x{FD3F}\x{FDFC}-\x{FDFD}' . '\x{FE10}-\x{FE19}\x{FE30}-\x{FE6B}\x{FEFF}-\x{FF0F}\x{FF1A}-\x{FF20}' . '\x{FF3B}-\x{FF40}\x{FF5B}-\x{FF65}\x{FFE0}-\x{FFFD}'); |