Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
project
drupal
Commits
372846e1
Commit
372846e1
authored
Dec 07, 2008
by
Angie Byron
Browse files
#333060
by merlinofchaos, dvessel, neclimdul: Prevent parent theme clobbering.
parent
fcb68d74
Changes
1
Hide whitespace changes
Inline
Side-by-side
includes/theme.inc
View file @
372846e1
...
...
@@ -776,6 +776,12 @@ function drupal_find_theme_functions($cache, $prefixes) {
$templates
[
$hook
]
=
array
(
'function'
=>
$prefix
.
'_'
.
$hook
,
);
// Ensure that the pattern is maintained from base themes to its sub-themes.
// Each sub-theme will have their functions scanned so the pattern must be
// held for subsequent runs.
if
(
isset
(
$info
[
'pattern'
]))
{
$templates
[
$hook
][
'pattern'
]
=
$info
[
'pattern'
];
}
}
}
}
...
...
@@ -841,6 +847,12 @@ function drupal_find_theme_templates($cache, $extension, $path) {
'path'
=>
dirname
(
$file
->
filename
),
);
}
// Ensure that the pattern is maintained from base themes to its sub-themes.
// Each sub-theme will have their templates scanned so the pattern must be
// held for subsequent runs.
if
(
isset
(
$cache
[
$hook
][
'pattern'
]))
{
$templates
[
$hook
][
'pattern'
]
=
$cache
[
$hook
][
'pattern'
];
}
}
$patterns
=
array_keys
(
$files
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment