diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-01-13 05:40:03 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-01-13 05:40:03 +0000 |
| commit | 02d2f6e04a29acb1c3fcedcd5068878cffb10fbf (patch) | |
| tree | 48d65b410f2dc34eaf8d69a822a09ec83e9d85df /modules/forum | |
| parent | 5d2cdb6ba95549da448e0a127e40fcc375e3886c (diff) | |
| download | brdo-02d2f6e04a29acb1c3fcedcd5068878cffb10fbf.tar.gz brdo-02d2f6e04a29acb1c3fcedcd5068878cffb10fbf.tar.bz2 | |
#678714 by effulgentsia: Unify use of theme hook / template suggestions, fix clobbering problems, and improve suggestion discovery performance.
Diffstat (limited to 'modules/forum')
| -rw-r--r-- | modules/forum/forum.module | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/modules/forum/forum.module b/modules/forum/forum.module index 8e9eba04c..53668052e 100644 --- a/modules/forum/forum.module +++ b/modules/forum/forum.module @@ -948,17 +948,17 @@ function template_preprocess_forums(&$variables) { // Provide separate template suggestions based on what's being output. Topic id is also accounted for. // Check both variables to be safe then the inverse. Forums with topic ID's take precedence. if ($variables['forums'] && !$variables['topics']) { - $variables['template_files'][] = 'forums-containers'; - $variables['template_files'][] = 'forums-' . $variables['tid']; - $variables['template_files'][] = 'forums-containers-' . $variables['tid']; + $variables['theme_hook_suggestions'][] = 'forums__containers'; + $variables['theme_hook_suggestions'][] = 'forums__' . $variables['tid']; + $variables['theme_hook_suggestions'][] = 'forums__containers__' . $variables['tid']; } elseif (!$variables['forums'] && $variables['topics']) { - $variables['template_files'][] = 'forums-topics'; - $variables['template_files'][] = 'forums-' . $variables['tid']; - $variables['template_files'][] = 'forums-topics-' . $variables['tid']; + $variables['theme_hook_suggestions'][] = 'forums__topics'; + $variables['theme_hook_suggestions'][] = 'forums__' . $variables['tid']; + $variables['theme_hook_suggestions'][] = 'forums__topics__' . $variables['tid']; } else { - $variables['template_files'][] = 'forums-' . $variables['tid']; + $variables['theme_hook_suggestions'][] = 'forums__' . $variables['tid']; } } |