From 0d0cfa98fdb78c7d3553a956ae67d2efd245e54e Mon Sep 17 00:00:00 2001 From: Vitaliy Filippov Date: Sat, 15 Aug 2015 13:22:05 +0300 Subject: [PATCH] Use local tpldata for INCLUDE without arguments --- template.parser.php | 6 +++--- template.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/template.parser.php b/template.parser.php index ef1a27f..9c7f30c 100644 --- a/template.parser.php +++ b/template.parser.php @@ -4,7 +4,7 @@ * Homepage: http://yourcmc.ru/wiki/VMX::Template * License: GNU GPLv3 or later * Author: Vitaliy Filippov, 2006-2015 - * Version: V3 (LALR), 2015-05-25 + * Version: V3 (LALR), 2015-08-15 * * This file contains the implementation of VMX::Template compiler. * It is only used when a template is compiled in runtime. @@ -558,10 +558,10 @@ $code /* Аргументы для функций включения аргументы ::= hash(ключ => значение, ...) | ключ => значение, ... */ - function auto_hash($args) + protected function auto_hash($args) { if (!($n = count($args))) - $args = NULL; + $args = ', $this->tpldata'; elseif ($n == 1) $args = ", ".$args[0]; else diff --git a/template.php b/template.php index 480babb..5cdcd2a 100644 --- a/template.php +++ b/template.php @@ -8,7 +8,7 @@ * Homepage: http://yourcmc.ru/wiki/VMX::Template * License: GNU GPLv3 or later * Author: Vitaliy Filippov, 2006-2015 - * Version: V3 (LALR), 2015-07-15 + * Version: V3 (LALR), 2015-08-15 * * The template engine is split into two parts: * (1) This file - always used when running templates