From 8d93eefea87bd36904fcb1daabc239361dd95a27 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Mon, 26 Sep 2011 12:18:39 +0200 Subject: [PATCH] remove global $lang var in templates. can't work as intended --- include/template_processor.php | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/include/template_processor.php b/include/template_processor.php index d04da8c610..63d75eaa4e 100644 --- a/include/template_processor.php +++ b/include/template_processor.php @@ -160,25 +160,8 @@ 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();