diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-02-27 13:34:19 -0500 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-02-27 13:34:19 -0500 |
| commit | 8c2bda46f7ad726da5cb69b96035142dc6dd1ca5 (patch) | |
| tree | e9b11902c9fe447d1057b8474b85c527a5667cac /include | |
| parent | b1cdc5a93273f7536cb1a3c9870214f6d0aaaed0 (diff) | |
| parent | e11b51aca14ea36b514fdd4348443f4fae79b2ca (diff) | |
| download | volse-hubzilla-8c2bda46f7ad726da5cb69b96035142dc6dd1ca5.tar.gz volse-hubzilla-8c2bda46f7ad726da5cb69b96035142dc6dd1ca5.tar.bz2 volse-hubzilla-8c2bda46f7ad726da5cb69b96035142dc6dd1ca5.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
revert 01a2791e3a to avoid random preg internal errors. fix contact_template
* master:
Diffstat (limited to 'include')
| -rwxr-xr-x | include/template_processor.php | 8 |
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); } |