From 4b1de0f538e6d3f48e2a4d1e82522aced6b08129 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20H=C3=B6=C3=9Fl?= <tobias@hoessl.eu>
Date: Sun, 26 Feb 2012 20:43:51 +0000
Subject: Avoid some notices

---
 include/template_processor.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'include/template_processor.php')

diff --git a/include/template_processor.php b/include/template_processor.php
index 0d476f0e6..7f270fb4b 100755
--- a/include/template_processor.php
+++ b/include/template_processor.php
@@ -32,11 +32,12 @@
 	
 			if(is_array($r) && count($r)) {
 				foreach ($r as $k => $v ) {
-					if (is_array($v))
+					if (is_array($v)) {
 						$this->_build_replace($v, "$prefix$k.");
-					
-					$this->search[] =  $prefix . $k;
-					$this->replace[] = $v;
+					} else {
+						$this->search[] =  $prefix . $k;
+						$this->replace[] = $v;
+					}
 				}
 			}
 		} 
@@ -53,7 +54,7 @@
 			$keys = array_map('trim',explode(".",$name));		
 			$val = $this->r;
 			foreach($keys as $k) {
-				$val = $val[$k];
+				$val = (isset($val[$k]) ? $val[$k] : null);
 			}
 			return $val;
 		}
@@ -79,8 +80,8 @@
 			} else {
 				$val = $this->_get_var($args[2]);
 			}
-			list($strue, $sfalse)= preg_split("|{{ *else *}}|", $args[3]);
-			return ($val?$strue:$sfalse);
+			$x = preg_split("|{{ *else *}}|", $args[3]);
+			return ( $val ? $x[0] : (isset($x[1]) ? $x[1] : ""));
 		}
 		
 		/**
-- 
cgit v1.2.3


From 42d591d25761fda0206dc5ab96e7d9b0fc779b42 Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Mon, 27 Feb 2012 18:48:59 +0100
Subject: revert 01a2791e3a to avoid random preg internal errors. fix
 contact_template

---
 include/template_processor.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'include/template_processor.php')

diff --git a/include/template_processor.php b/include/template_processor.php
index 7f270fb4b..28c3f07dd 100755
--- a/include/template_processor.php
+++ b/include/template_processor.php
@@ -160,7 +160,8 @@
 			krsort($this->nodes);
 			return $s;
 		}
-
+		
+        /*
 		private function _str_replace($str){
 			#$this->search,$this->replace,
 			$searchs = $this->search;
@@ -183,7 +184,7 @@
 				
 			}
 			return str_replace($this->search,$this->replace, $str);
-		}
+		}*/
 
 	
 		public function replace($s, $r) {
@@ -205,7 +206,8 @@
 			$os = ""; $count=0;
 			while($os!=$s && $count<10){
 				$os=$s; $count++;
-				$s = $this->_str_replace($s);
+				//$s = $this->_str_replace($s);
+				$s = str_replace($this->search, $this->replace, $s);
 			}
 			return template_unescape($s);
 		}
-- 
cgit v1.2.3