projects
/
yaffs-website
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Security update for Core, with self-updated composer
[yaffs-website]
/
web
/
core
/
includes
/
theme.inc
diff --git
a/web/core/includes/theme.inc
b/web/core/includes/theme.inc
index 498c490beb285c3d2bd7978302c56ac35e5d8e09..68b10b3e42e758b1f5e7f4938949d00fd3a4672b 100644
(file)
--- a/
web/core/includes/theme.inc
+++ b/
web/core/includes/theme.inc
@@
-240,8
+240,7
@@
function drupal_find_theme_templates($cache, $extension, $path) {
// Match templates based on the 'template' filename.
foreach ($cache as $hook => $info) {
if (isset($info['template'])) {
// Match templates based on the 'template' filename.
foreach ($cache as $hook => $info) {
if (isset($info['template'])) {
- $template_candidates = [$info['template'], str_replace($info['theme path'] . '/templates/', '', $info['template'])];
- if (in_array($template, $template_candidates)) {
+ if ($template === $info['template']) {
$implementations[$hook] = [
'template' => $template,
'path' => dirname($file->uri),
$implementations[$hook] = [
'template' => $template,
'path' => dirname($file->uri),
@@
-462,7
+461,7
@@
function theme_render_and_autoescape($arg) {
*
* @param array $theme_settings
* An array of theme settings from system setting form or a Drupal 7 variable.
*
* @param array $theme_settings
* An array of theme settings from system setting form or a Drupal 7 variable.
- * @param Config $config
+ * @param
\Drupal\Core\Config\
Config $config
* The configuration object to update.
*
* @return
* The configuration object to update.
*
* @return