Merge branch 'pull'

[friendica.git] / include / template_processor.php

diff --git a/include/template_processor.php b/include/template_processor.php
index d1ff3998f0c84f0cf70a37a2d564a559da68e8f7..efdfbaecb78a73fb61bdf90c4b259015bbfe49c6 100644 (file)
--- a/include/template_processor.php
+++ b/include/template_processor.php
@@ -86,7 +86,7 @@
                                $r[$a] = $this->_get_var($b); 
                        }
                        $this->nodes = Array();
-                       $tpl = load_view_file($tplfile);
+                       $tpl = get_markup_template($tplfile);
                        $ret = $this->replace($tpl, $r);
                        $this->_pop_stack();
                        return $ret;
@@ -128,7 +128,7 @@
                        #$s = str_replace(array("\n","\r"),array("§n§","§r§"),$s);
                        $s = $this->_build_nodes($s);
                        $s = preg_replace_callback('/\|\|([0-9]+)\|\|/', array($this, "_replcb_node"), $s);
-                       $s = str_replace($this->search,$this->replace,$s);
+                       $s = str_replace($this->search,$this->replace, (string) $s);
                        
                        return $s;
                }