include diaspora mentions in personal (requires adding a Diaspora profile url because...

[friendica.git] / include / template_processor.php

diff --git a/include/template_processor.php b/include/template_processor.php
index d04da8c6106808655b754d2175188a842701eac1..25f7703a2192cfe4b41a76c958c35514bb75fe45 100644 (file)
--- a/include/template_processor.php
+++ b/include/template_processor.php
@@ -160,39 +160,22 @@
                        return $s;
                }
 
-               private function _get_lang(){
-                       if ($this->lang!=null) return $this->lang;
-                       
-                       $a = get_app();
-                       $this->lang=array();
-                       if(is_array($a->strings) && count($a->strings)) {
-                               foreach ($a->strings as $k=>$v){
-                                       $k =  preg_replace("/[^a-z0-9-]/", "", str_replace(" ","-", strtolower($k)));
-                                       $this->lang[$k] = $v;
-                               }
-                       }
-                       return $this->lang;
-               }
-
-               
+       
                public function replace($s, $r) {
-                       if (!x($r,'$lang')){
-                               $r['$lang'] = &$this->_get_lang();
-                       }
                        $this->r = $r;
                        $this->search = array();
                        $this->replace = array();
-       
+
                        $this->_build_replace($r, "");
                        
                        #$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);
                        if ($s==Null) $this->_preg_error();
                        
                        // remove comments block
                        $s = preg_replace('/{#[^#]*#}/', "" , $s);
-                                               
                        // replace strings recursively (limit to 10 loops)
                        $os = ""; $count=0;
                        while($os!=$s && $count<10){