Mirrors/grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2025-02-20 19:56:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed |t(variable) twig filter in admin

Browse Source
This commit is contained in:
Matias Griese 2021-11-03 13:10:10 +02:00
parent a723bcdb46
commit 8bbf7a849b
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -7,6 +7,7 @@
* Improved page cloning, added method `Page::initialize()`
2. [](#bugfix)
* Fixed unescaped error messages in JSON error responses
* Fixed `|t(variable)` twig filter in admin
# v1.7.24
## 10/26/2021

6
system/src/Grav/Common/Twig/Extension/GravExtension.php
View File

@ -847,6 +847,12 @@ class GravExtension extends AbstractExtension implements GlobalsInterface
if (($numargs === 3 && is_array($args[1])) || ($numargs === 2 && !is_array($args[1]))) {
$lang = array_pop($args);
/** @var Language $language */
$language = $this->grav['language'];
if (is_string($lang) && !$language->getLanguageCode($lang)) {
$args[] = $lang;
$lang = null;
}
} elseif ($numargs === 2 && is_array($args[1])) {
$subs = array_pop($args);
$args = array_merge($args, $subs);