Fix in CryptoHelper class, templates are now loaded from application (templates in...

[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 c40b183c021148b0cc3fba84b297083080e53bf7..21234b81e8295b2e6eac43680f543a7068202fb8 100644 (file)
--- a/inc/classes/main/template/class_BaseTemplateEngine.php
+++ b/inc/classes/main/template/class_BaseTemplateEngine.php
@@ -523,7 +523,9 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
                } // END - if
 
                // Construct the FQFN for the template by honoring the current language
-               $fqfn = sprintf("%s%s/%s/%s%s",
+               $fqfn = sprintf("%s%s/%s%s/%s/%s%s",
+                       $this->getConfigInstance()->readConfig('application_path'),
+                       Registry::getRegistry()->getInstance('application')->getAppShortName(),
                        $this->getBasePath(),
                        $this->getLanguageInstance()->getLanguageCode(),
                        $this->getTemplateType(),
@@ -1018,7 +1020,7 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
                        @eval($eval);
 
                        // Goes something wrong?
-                       if (!isset($result)) {
+                       if ((!isset($result)) || (empty($result))) {
                                // Output eval command
                                $this->debugOutput(sprintf("Failed eval() code: <pre>%s</pre>", $this->markupCode($eval, true)), true);