diff options
Diffstat (limited to 'includes/theme.inc')
| -rw-r--r-- | includes/theme.inc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/includes/theme.inc b/includes/theme.inc index 0c9b0c3ed..5d5363113 100644 --- a/includes/theme.inc +++ b/includes/theme.inc @@ -2460,20 +2460,22 @@ function theme_get_suggestions($args, $base, $delimiter = '__') { // page__node__edit page-node-edit $suggestions = array(); + $prefix = $base; foreach ($args as $arg) { // Remove slashes or null per SA-CORE-2009-003. $arg = str_replace(array("/", "\\", "\0"), '', $arg); // The percent acts as a wildcard for numeric arguments since // asterisks are not valid filename characters on many filesystems. if (is_numeric($arg)) { - $suggestions[] = $base . $delimiter . '%'; + $suggestions[] = $prefix . $delimiter . '%'; } - $suggestions[] = $base . $delimiter . $arg; + $suggestions[] = $prefix . $delimiter . $arg; if (!is_numeric($arg)) { - $base .= $delimiter . $arg; + $prefix .= $delimiter . $arg; } } if (drupal_is_front_page()) { + // Front templates should be based on root only, not prefixed arguments. $suggestions[] = $base . $delimiter . 'front'; } |