From d6aadf81f11cbb3cda030d095feb6e8c8a44aafe Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 23 Jan 2014 04:36:33 -0500
Subject: [PATCH] Fixed: tpl class now accepts 4 parameters instead of 3 in tags
---
server/lib/classes/tpl.inc.php | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/server/lib/classes/tpl.inc.php b/server/lib/classes/tpl.inc.php
index b4d8ca2..6dc4913 100644
--- a/server/lib/classes/tpl.inc.php
+++ b/server/lib/classes/tpl.inc.php
@@ -962,6 +962,16 @@
$regex.= '[^\"\']*|[a-z0-9_\.]*)';
$regex.= '[\"\']?';
$regex.= ')?\s*';
+ $regex.= '(?:';
+ $regex.= '(?:';
+ $regex.= '(name|format|escape|op|value)';
+ $regex.= '\s*=\s*';
+ $regex.= ')';
+ $regex.= '(?:[\"\'])?';
+ $regex.= '((?<=[\"\'])';
+ $regex.= '[^\"\']*|[a-z0-9_\.]*)';
+ $regex.= '[\"\']?';
+ $regex.= ')?\s*';
$regex.= '(?:>|\/>|}|-->){1}';
$regex.= '/i';
//$regex.= '([\r\n|\n|\r])?/ie';
@@ -1290,7 +1300,7 @@
$wholetag = $args[0];
$openclose = $args[1];
$tag = strtolower($args[2]);
- $newline = $args[9];
+ $newline = $args[11];
//echo "1#$newline#2";
if ($tag == 'else') return '<?php } else { ?>'.$newline;
@@ -1307,7 +1317,7 @@
}
// arrange attributes
- for ($i=3; $i < 8; $i=($i+2)) {
+ for ($i=3; $i < 10; $i=($i+2)) {
if (empty($args[$i]) && empty($args[($i+1)])) break;
$key = (empty($args[$i])) ? 'name' : strtolower($args[$i]);
if ($key == 'name' && preg_match('/^(php)?include$/', $tag)) $key = 'file';
--
Gitblit v1.9.1