From f19cb94f89cf3f00659e474832eaf1cf1b3109f6 Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Fri, 1 Mar 2019 05:25:29 -0700 Subject: [PATCH 1/2] cleanup --- system/src/Grav/Common/Twig/TwigExtension.php | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/system/src/Grav/Common/Twig/TwigExtension.php b/system/src/Grav/Common/Twig/TwigExtension.php index 34375cbe6..e8e1941de 100644 --- a/system/src/Grav/Common/Twig/TwigExtension.php +++ b/system/src/Grav/Common/Twig/TwigExtension.php @@ -720,19 +720,12 @@ class TwigExtension extends \Twig_Extension implements \Twig_Extension_GlobalsIn */ public function translate(\Twig_Environment $twig) { - static $admin_call; - - // One time check and assignment of admin provided tu filter - if ($admin_call == null) { - $admin_call = isset($this->grav['admin']); - } - // shift off the environment $args = func_get_args(); array_shift($args); // If admin and tu filter provided, use it - if ($admin_call) { + if (isset($this->grav['admin'])) { $numargs = count($args); $lang = null; From 8ffba2d88d1b374b173da33344430e1c98d5ca4e Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Fri, 1 Mar 2019 05:44:21 -0700 Subject: [PATCH 2/2] fix typo --- system/blueprints/config/backups.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/blueprints/config/backups.yaml b/system/blueprints/config/backups.yaml index 2d054d049..8e1896312 100644 --- a/system/blueprints/config/backups.yaml +++ b/system/blueprints/config/backups.yaml @@ -25,7 +25,7 @@ form: options: space: Maximum Backup Space number: Maximum Number of Backups - time: maximum Rention Time + time: maximum Retention Time validate: required: true @@ -55,7 +55,7 @@ form: purge.max_backups_time: type: number - label: Maximum Rention Time + label: Maximum Retention Time append: in Days size: x-small default: 365