Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-06-20 14:20:41 +02:00
Code Issues Packages Projects Releases Activity

Merge remote-tracking branch 'origin/1.6' into 1.6

Browse Source
This commit is contained in:
Matias Griese
2019-03-01 14:48:01 +02:00
parent 1762ef3d1e 8ffba2d88d
commit 4b1a129f38
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
system/blueprints/config/backups.yaml
View File

@@ -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

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

@@ -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;