aboutsummaryrefslogtreecommitdiffstats
path: root/include/template_processor.php
diff options
context:
space:
mode:
authorTobias Hößl <tobias@hoessl.eu>2012-02-28 21:19:02 +0000
committerTobias Hößl <tobias@hoessl.eu>2012-02-28 21:19:02 +0000
commit3d249f0eddb058f74b33d8205202b17ab7555aa6 (patch)
tree112e38aa464e5830832ff92a93e10f2566cbe27e /include/template_processor.php
parent36a1a43f06dc2a0d55463c83154cce55fa3948ad (diff)
parent733f830be4b554c83361e877a5f1108767a815fc (diff)
downloadvolse-hubzilla-3d249f0eddb058f74b33d8205202b17ab7555aa6.tar.gz
volse-hubzilla-3d249f0eddb058f74b33d8205202b17ab7555aa6.tar.bz2
volse-hubzilla-3d249f0eddb058f74b33d8205202b17ab7555aa6.zip
Merge remote branch 'upstream/master'
Diffstat (limited to 'include/template_processor.php')
-rwxr-xr-xinclude/template_processor.php8
1 files changed, 5 insertions, 3 deletions
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);
}