Bugfix in template parser class

Marius Cramer · Marius Cramer · commit 164349784edc · 2014-02-07T13:45:30.000+01:00
diff --git a/server/lib/classes/tpl.inc.php b/server/lib/classes/tpl.inc.php
@@ -1132,14 +1132,14 @@ function _parseIf ($varname, $value=null, $op=null, $namespace=null, $format=nul
 			if ($this->OPTIONS['GLOBAL_VARS'] && empty($namespace)) {
 				$retstr = '(('.$retstr.'[\''.$varname.'\'] !== null) ? '.$retstr.'[\''.$varname.'\'] : $this->_vars[\''.$varname.'\'])';
 				if(isset($format) && isset($value) && $format == 'version') {
-					return 'version_compare(' . $retstr . ', \'' . $value . '\', ' . (!empty($op) ? $op : '==') . ')';
+					return 'version_compare(' . $retstr . ', \'' . $value . '\', \'' . (!empty($op) ? $op : '==') . '\')';
 				} else {
 					return $retstr.$comp_str;
 				}
 			}
 			else {
 				if(isset($format) && isset($value) && $format == 'version') {
-					return 'version_compare(' . $retstr."['".$varname."']" . ', \'' . $value . '\', ' . (!empty($op) ? $op : '==') . ')';
+					return 'version_compare(' . $retstr."['".$varname."']" . ', \'' . $value . '\', \'' . (!empty($op) ? $op : '==') . '\')';
 				} else {
 					return $retstr."['".$varname."']".$comp_str;
 				}

Original file line number	Diff line number	Diff line change
`@@ -1132,14 +1132,14 @@ function _parseIf ($varname, $value=null, $op=null, $namespace=null, $format=nul`
`1132`	`1132`	`if ($this->OPTIONS['GLOBAL_VARS'] && empty($namespace)) {`
`1133`	`1133`	`$retstr = '(('.$retstr.'[\''.$varname.'\'] !== null) ? '.$retstr.'[\''.$varname.'\'] : $this->_vars[\''.$varname.'\'])';`
`1134`	`1134`	`if(isset($format) && isset($value) && $format == 'version') {`
`1135`		`- return 'version_compare(' . $retstr . ', \'' . $value . '\', ' . (!empty($op) ? $op : '==') . ')';`
	`1135`	`+ return 'version_compare(' . $retstr . ', \'' . $value . '\', \'' . (!empty($op) ? $op : '==') . '\')';`
`1136`	`1136`	`} else {`
`1137`	`1137`	`return $retstr.$comp_str;`
`1138`	`1138`	`}`
`1139`	`1139`	`}`
`1140`	`1140`	`else {`
`1141`	`1141`	`if(isset($format) && isset($value) && $format == 'version') {`
`1142`		`- return 'version_compare(' . $retstr."['".$varname."']" . ', \'' . $value . '\', ' . (!empty($op) ? $op : '==') . ')';`
	`1142`	`+ return 'version_compare(' . $retstr."['".$varname."']" . ', \'' . $value . '\', \'' . (!empty($op) ? $op : '==') . '\')';`
`1143`	`1143`	`} else {`
`1144`	`1144`	`return $retstr."['".$varname."']".$comp_str;`
`1145`	`1145`	`}`