Fixes

diff --git a/inc/functions.php b/inc/functions.php
index ad3b1e5f55a558e7b52a12cf33800a9cc93b3292..476927420cdfa2b60f719e567ffd350e494f194f 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -270,7 +270,7 @@ function loadTemplate ($template, $return = false, $content = array()) {
        global $DATA;
 
        // Do we have cache?
        global $DATA;
 
        // Do we have cache?

-       if (isTemplateCached($template)) {
+       if ((isDebuggingTemplateCache() === false) && (isTemplateCached($template))) {

                // Evaluate the cache
                eval(readTemplateCache($template));
        } elseif (!isset($GLOBALS['template_eval'][$template])) {
                // Evaluate the cache
                eval(readTemplateCache($template));
        } elseif (!isset($GLOBALS['template_eval'][$template])) {

diff --git a/inc/install-inc.php b/inc/install-inc.php
index 137257c89eb38d47fd03b58585a54af691c593e8..17c0c0c6331bbb4e9ef5e4b56faa788223e8b636 100644 (file)
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -131,7 +131,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                        $content['email']      = postRequestParameter('email');
 
                        // Use default SMTP data
                        $content['email']      = postRequestParameter('email');
 
                        // Use default SMTP data

-                       $smtpHost  = '{?SMTP_HOSTNAME');
+                       $smtpHost  = '{?SMTP_HOSTNAME?}';

                        $smtpUser  = '{?SMTP_USER?}';
                        $smtpPass1 = '{?SMTP_PASSWORD?}';
                        $smtpPass2 = '{?SMTP_PASSWORD?}';
                        $smtpUser  = '{?SMTP_USER?}';
                        $smtpPass1 = '{?SMTP_PASSWORD?}';
                        $smtpPass2 = '{?SMTP_PASSWORD?}';