Fix bug with wrong path to site directory in combination with a multisite setup

Author: wanze

TemplateEngine.php

@@ -8,12 +8,6 @@
  * @author Stefan Wanzenried <stefan.wanzenried@gmail.com>
  * @license http://www.gnu.org/licenses/gpl-2.0.txt GNU General Public License, version 2
  *
- * ProcessWire 2.x
- * Copyright (C) 2014 by Ryan Cramer
- * Licensed under GNU/GPL v2, see LICENSE.TXT
- *
- * http://processwire.com
- *
  */
 abstract class TemplateEngine extends Wire
 {
@@ -53,7 +47,6 @@ public function __construct($filename = '')
 
     /**
      * Register the template engine when installing
-     *
      */
     public function install()
     {
@@ -63,20 +56,20 @@ public function install()
 
     /**
      * Unregister template engine when uninstalling
-     *
      */
     public function uninstall()
     {
         $this->factory->unregisterEngine($this);
     }
 
 
-    public function init() {}
+    public function init()
+    {
+    }
 
 
     /**
      * Init engine, derived classes must use this method to setup the engine
-     *
      */
     abstract public function initEngine();
 
@@ -126,7 +119,9 @@ public static function getDefaultConfig()
      * In our context, the config is loaded and available already in the constructor so just leave empty
      *
      */
-    public function setConfigData(array $data = array()) {}
+    public function setConfigData(array $data = array())
+    {
+    }
 
 
     /**
@@ -222,7 +217,8 @@ public function setFilename($filename)
     public function getTemplatesPath()
     {
         $path = ltrim($this->getConfig('templates_path'), '/');
-        return $this->config->paths->root . 'site/' . rtrim($path, '/') . '/';
+
+        return $this->wire('config')->paths->site . rtrim($path, '/') . '/';
     }
 
 

TemplateEngineCache.php

@@ -9,12 +9,6 @@
  *
  * @author Stefan Wanzenried <stefan.wanzenried@gmail.com>
  *
- * ProcessWire 2.x
- * Copyright (C) 2014 by Ryan Cramer
- * Licensed under GNU/GPL v2, see LICENSE.TXT
- *
- * http://processwire.com
- *
  */
 
 interface TemplateEngineCache {

TemplateEngineFactory.module

@@ -14,13 +14,7 @@ require_once('TemplateEngineNull.php');
  *
  * @author Stefan Wanzenried <stefan.wanzenried@gmail.com>
  * @license http://www.gnu.org/licenses/gpl-2.0.txt GNU General Public License, version 2
- * @version 1.0.2
- *
- * ProcessWire 2.x
- * Copyright (C) 2014 by Ryan Cramer
- * Licensed under GNU/GPL v2, see LICENSE.TXT
- *
- * http://processwire.com
+ * @version 1.0.3
  *
  */
 class TemplateEngineFactory extends WireData implements Module, ConfigurableModule
@@ -267,7 +261,7 @@ class TemplateEngineFactory extends WireData implements Module, ConfigurableModu
     {
         return array(
             'title' => 'Template Engine Factory',
-            'version' => 102,
+            'version' => 103,
             'author' => 'Stefan Wanzenried',
             'summary' => 'This module aims to separate logic from markup.' .
                 'Turns ProcessWire templates into controllers which can interact over a new API ' .

TemplateEngineNull.php

@@ -6,11 +6,6 @@
  *
  * @author Stefan Wanzenried <stefan.wanzenried@gmail.com>
  *
- * ProcessWire 2.x
- * Copyright (C) 2014 by Ryan Cramer
- * Licensed under GNU/GPL v2, see LICENSE.TXT
- *
- * http://processwire.com
  */
 
 class TemplateEngineNull extends TemplateEngine

TemplateEngineProcesswire.module

@@ -8,11 +8,6 @@ require_once('TemplateEngine.php');
  * @license http://www.gnu.org/licenses/gpl-2.0.txt GNU General Public License, version 2
  * @version 1.0.1
  *
- * ProcessWire 2.x
- * Copyright (C) 2014 by Ryan Cramer
- * Licensed under GNU/GPL v2, see LICENSE.TXT
- *
- * http://processwire.com
  */
 class TemplateEngineProcesswire extends TemplateEngine implements Module, ConfigurableModule
 {