From 6cc296f094e6af4f43afe63864d009cf01b1f0b5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Mon, 28 Jun 2010 08:04:48 +0000 Subject: [PATCH] Fixes --- inc/functions.php | 2 +- inc/install-inc.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/inc/functions.php b/inc/functions.php index ad3b1e5f55..476927420c 100644 --- 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? - if (isTemplateCached($template)) { + if ((isDebuggingTemplateCache() === false) && (isTemplateCached($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 137257c89e..17c0c0c633 100644 --- 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 - $smtpHost = '{?SMTP_HOSTNAME'); + $smtpHost = '{?SMTP_HOSTNAME?}'; $smtpUser = '{?SMTP_USER?}'; $smtpPass1 = '{?SMTP_PASSWORD?}'; $smtpPass2 = '{?SMTP_PASSWORD?}'; -- 2.30.2