diff options
| author | friendica <info@friendica.com> | 2012-02-26 14:49:56 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-02-26 14:49:56 -0800 |
| commit | 6ddd444afde33337235eab3aa9d6d1fe12bcb7a4 (patch) | |
| tree | 9a8ed6282b805732251d254cadef124c90c85727 /include/template_processor.php | |
| parent | b79380f906731ed1aa4dfa540dcf297fe253c904 (diff) | |
| parent | 4b1de0f538e6d3f48e2a4d1e82522aced6b08129 (diff) | |
| download | volse-hubzilla-6ddd444afde33337235eab3aa9d6d1fe12bcb7a4.tar.gz volse-hubzilla-6ddd444afde33337235eab3aa9d6d1fe12bcb7a4.tar.bz2 volse-hubzilla-6ddd444afde33337235eab3aa9d6d1fe12bcb7a4.zip | |
Merge pull request #49 from CatoTH/master
Bugfix for del_config
Diffstat (limited to 'include/template_processor.php')
| -rwxr-xr-x | include/template_processor.php | 15 |
1 files changed, 8 insertions, 7 deletions
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] : "")); } /** |