Better IP than hostname

[core.git] / inc / classes / main / template / class_BaseTemplateEngine.php

diff --git a/inc/classes/main/template/class_BaseTemplateEngine.php b/inc/classes/main/template/class_BaseTemplateEngine.php
index 89570fd2c52d37249340a975d61deb54457b039d..65152544391ae55c93ee180069376915fc4c78b1 100644 (file)
--- a/inc/classes/main/template/class_BaseTemplateEngine.php
+++ b/inc/classes/main/template/class_BaseTemplateEngine.php
@@ -156,6 +156,12 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
        protected function __construct ($className) {
                // Call parent constructor
                parent::__construct($className);
+
+               // Init file I/O instance
+               $ioInstance = ObjectFactory::createObjectByConfiguredName('file_io_class');
+
+               // Set it
+               $this->setFileIoInstance($ioInstance);
        }
 
        /**
@@ -1348,21 +1354,21 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
        /**
         * Assigns all the application data with template variables
         *
-        * @param       $appInstance    A manageable application instance
+        * @param       $applicationInstance    A manageable application instance
         * @return      void
         */
-       public function assignApplicationData (ManageableApplication $appInstance) {
+       public function assignApplicationData (ManageableApplication $applicationInstance) {
                // Get long name and assign it
-               $this->assignVariable('app_full_name' , $appInstance->getAppName());
+               $this->assignVariable('app_full_name' , $applicationInstance->getAppName());
 
                // Get short name and assign it
-               $this->assignVariable('app_short_name', $appInstance->getAppShortName());
+               $this->assignVariable('app_short_name', $applicationInstance->getAppShortName());
 
                // Get version number and assign it
-               $this->assignVariable('app_version'   , $appInstance->getAppVersion());
+               $this->assignVariable('app_version'   , $applicationInstance->getAppVersion());
 
                // Assign extra application-depending data
-               $appInstance->assignExtraTemplateData($this);
+               $applicationInstance->assignExtraTemplateData($this);
        }
 
        /**
@@ -1518,6 +1524,9 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
                        } // END - foreach
                } // END - if
 
+               // Set the content again
+               $this->setRawTemplateData($compactedContent);
+
                // Return compacted content
                return $compactedContent;
        }