aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-02-27 17:18:53 -0800
committerfriendica <info@friendica.com>2012-02-27 17:18:53 -0800
commit6c0fa7a1665ab36d733b93ce51802b14e8504658 (patch)
treecbbf87df24912165e7a237b8d4996078319aa71b /include
parentd7407f8daaab14ecba59cc3cb211ff93802dd761 (diff)
parente11b51aca14ea36b514fdd4348443f4fae79b2ca (diff)
downloadvolse-hubzilla-6c0fa7a1665ab36d733b93ce51802b14e8504658.tar.gz
volse-hubzilla-6c0fa7a1665ab36d733b93ce51802b14e8504658.tar.bz2
volse-hubzilla-6c0fa7a1665ab36d733b93ce51802b14e8504658.zip
Merge branch 'pull'
Diffstat (limited to 'include')
-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);
}