some changes ...

[phpgitweb.git] / htdocs / lib / ContentProvider.class.php

diff --git a/htdocs/lib/ContentProvider.class.php b/htdocs/lib/ContentProvider.class.php
index cd88b91e8b025b8e7347f849bc41f7fa22a8ce25..e88b948ff3872115b925c2819a46976eb9360388 100644 (file)
--- a/htdocs/lib/ContentProvider.class.php
+++ b/htdocs/lib/ContentProvider.class.php
@@ -41,6 +41,8 @@ class ContentProvider {
                        return;
                if(!array_key_exists(strtolower($name), $this->content))
                        $this->content[strtolower($name)] = array();
+               if(!is_array($this->content[strtolower($name)]))
+                       $this->content[strtolower($name)] = array($this->content[strtolower($name)]);
                $this->content[strtolower($name)][] = $value;
        }
        
@@ -76,12 +78,12 @@ class ContentProvider {
                case "year":
                        $rep = date("Y");
                        break;
-               case "title":
-                       $rep = GitConfig::GITWEB_TITLE;
-                       break;
                case "rendertime":
                        $rep = "%rendertime%"; //gets replaced later
                        break;
+               case "template_path":
+                       $rep = 'templates/'.(GitConfig::TEMPLATE_NAME ? GitConfig::TEMPLATE_NAME : 'default');
+                       break;
                default:
                        if(array_key_exists($var, $this->content)) {
                                $rep = $this->resolve_content($this->content[$var]);
@@ -113,7 +115,9 @@ class ContentProvider {
                else {
                        $template_html = $this->load_template($this->template, $subtemplate);
                }
-               $template_html = preg_replace_callback('/%([^%]*)%/', array($this, "replace_placeholder"), $template_html);
+               $template_html = preg_replace('/([\r\n]*)$/mD', '', $template_html);
+               $template_html = preg_replace_callback('/%([^%\n]*)%/', array($this, "replace_placeholder"), $template_html);
+               $template_html = preg_replace_callback('/%([^%\n]*)%/', array($this, "replace_placeholder"), $template_html);
                
                return $template_html;
        }