Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-03-01 18:11:25 +01:00
Code Issues Packages Projects Releases Activity

Fixed missing return value in TwigExtension::svgImageFunction(), some code cleanup

Browse Source
This commit is contained in:
Matias Griese
2020-12-11 11:32:43 +02:00
parent a729daa3d3
commit 02a3ed2e0e
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
system/src/Grav/Common/Twig/Twig.php
View File

@@ -92,7 +92,7 @@ class Twig
// handle language templates if available
if ($language->enabled()) {
$lang_templates = $locator->findResource('theme://templates/' . ($active_language ? $active_language : $language->getDefault()));
$lang_templates = $locator->findResource('theme://templates/' . ($active_language ?: $language->getDefault()));
if ($lang_templates) {
$this->twig_paths[] = $lang_templates;
}
@@ -118,7 +118,7 @@ class Twig
// handle language templates if available
if ($language->enabled()) {
$lang_templates = $locator->findResource('theme://'.$prefix.'templates/' . ($active_language ? $active_language : $language->getDefault()));
$lang_templates = $locator->findResource('theme://'.$prefix.'templates/' . ($active_language ?: $language->getDefault()));
if ($lang_templates) {
$twig_paths[] = $lang_templates;
}
@@ -160,7 +160,7 @@ class Twig
return new TwigFunction($name, $name);
}
return new TwigFunction($name, function () {
return new TwigFunction($name, static function () {
});
});
}
@@ -171,7 +171,7 @@ class Twig
return new TwigFilter($name, $name);
}
return new TwigFilter($name, function () {
return new TwigFilter($name, static function () {
});
});
}

11
system/src/Grav/Common/Twig/TwigExtension.php
View File

@@ -631,7 +631,7 @@ class TwigExtension extends AbstractExtension implements GlobalsInterface
}
$results = Security::detectXssFromArray($data);
$results_parts = array_map(function ($value, $key) {
$results_parts = array_map(static function ($value, $key) {
return $key.': \''.$value . '\'';
}, array_values($results), array_keys($results));
@@ -1364,10 +1364,9 @@ class TwigExtension extends AbstractExtension implements GlobalsInterface
if (isset($value)) {
if ($exists) {
return $page;
} else {
return $value;
}
return $value;
}
$page = $page->parent();
}
@@ -1375,9 +1374,9 @@ class TwigExtension extends AbstractExtension implements GlobalsInterface
if ($exists) {
return false;
} else {
return Grav::instance()['config']->get('theme.' . $var, $default);
}
return Grav::instance()['config']->get('theme.' . $var, $default);
}
/**
@@ -1470,6 +1469,8 @@ class TwigExtension extends AbstractExtension implements GlobalsInterface
return $svg;
}
return null;
}