update to smarty 3.1.23

diff --git a/lib/api/smarty/Autoloader.php b/lib/api/smarty/Autoloader.php
index 0b7948044e36483aa4c5938cbec61b73e8a1e451..a24cad6f7e65adf226708eb7ebb81c638b3feaa0 100644 (file)
--- a/lib/api/smarty/Autoloader.php
+++ b/lib/api/smarty/Autoloader.php
@@ -60,6 +60,7 @@ class Smarty_Autoloader
         'smarty_template_source'                => true,
         'smarty_template_compiled'              => true,
         'smarty_template_cached'                => true,
+        'smarty_template_config'                => true,
         'smarty_data'                           => true,
         'smarty_variable'                       => true,
         'smarty_undefined_variable'             => true,

diff --git a/lib/api/smarty/Smarty.class.php b/lib/api/smarty/Smarty.class.php
index 3e3d9b9114372efda3d4bb6588ac5f2b98d6fe93..0b168e8525b45dea239064ecc8e8005c104de7c4 100644 (file)
--- a/lib/api/smarty/Smarty.class.php
+++ b/lib/api/smarty/Smarty.class.php
@@ -111,7 +111,7 @@ class Smarty extends Smarty_Internal_TemplateBase
     /**
      * smarty version
      */
-    const SMARTY_VERSION = '3.1.22';
+    const SMARTY_VERSION = '3.1.23';
 
     /**
      * define variable scopes

diff --git a/lib/api/smarty/smarty_version b/lib/api/smarty/smarty_version
index c74514703692f145b810a791318e6d9cdec35beb..fac63b027858260c16c76bebbd40fdf3828d87e4 100644 (file)
--- a/lib/api/smarty/smarty_version
+++ b/lib/api/smarty/smarty_version
@@ -1 +1 @@
-3.1.22
\ No newline at end of file
+3.1.23
\ No newline at end of file

diff --git a/lib/api/smarty/sysplugins/smarty_internal_compile_private_php.php b/lib/api/smarty/sysplugins/smarty_internal_compile_private_php.php
index a6ae8facb5aef33dd175ea801d735ee3d0ba8cf1..1b5652a11cd7ba35cea7f657027c0c45dfa70051 100644 (file)
--- a/lib/api/smarty/sysplugins/smarty_internal_compile_private_php.php
+++ b/lib/api/smarty/sysplugins/smarty_internal_compile_private_php.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Smarty Internal Plugin Compile Print Expression
+ * Smarty Internal Plugin Compile PHP Expression
  * Compiles any tag which will output an expression or variable
  *
  * @package    Smarty
@@ -9,7 +9,7 @@
  */
 
 /**
- * Smarty Internal Plugin Compile Print Expression Class
+ * Smarty Internal Plugin Compile PHP Expression Class
  *
  * @package    Smarty
  * @subpackage Compiler

diff --git a/lib/api/smarty/sysplugins/smarty_template_cached.php b/lib/api/smarty/sysplugins/smarty_template_cached.php
index 3f000f7f9ba0ea051272f125332e589eb4705eed..5b90439588ccf294ed211f874222c5e55cb76d28 100644 (file)
--- a/lib/api/smarty/sysplugins/smarty_template_cached.php
+++ b/lib/api/smarty/sysplugins/smarty_template_cached.php
@@ -149,8 +149,7 @@ class Smarty_Template_Cached
         }
         while (true) {
             while (true) {
-                $this->handler->populate($this, $_template);
-                if ($this->exists === false || $_template->smarty->force_compile || $_template->smarty->force_cache) {
+                 if ($this->exists === false || $_template->smarty->force_compile || $_template->smarty->force_cache) {
                     $this->valid = false;
                 } else {
                     $this->valid = true;
@@ -159,6 +158,9 @@ class Smarty_Template_Cached
                     // lifetime expired
                     $this->valid = false;
                 }
+                if ($this->valid && $_template->source->timestamp > $this->timestamp) {
+                    $this->valid = false;
+                }
                 if ($this->valid || !$_template->smarty->cache_locking) {
                     break;
                 }
@@ -166,6 +168,7 @@ class Smarty_Template_Cached
                     $this->handler->acquireLock($_template->smarty, $this);
                     break 2;
                 }
+                $this->handler->populate($this, $_template);
             }
             if ($this->valid) {
                 if (!$_template->smarty->cache_locking || $this->handler->locked($_template->smarty, $this) === null) {
@@ -200,7 +203,7 @@ class Smarty_Template_Cached
             }
             return $this->valid;
         }
-        return $this->valid = false;
+        return $this->valid;
     }
 
     /**

diff --git a/lib/system/SystemException.class.php b/lib/system/SystemException.class.php
index 0a181c0c72cc35082c1d6c52861fa8473d5aea3b..e616371e46d003d1698802f727dcf6117aee72d9 100644 (file)
--- a/lib/system/SystemException.class.php
+++ b/lib/system/SystemException.class.php
@@ -240,7 +240,7 @@ class SystemException extends \Exception {
                                                                        Unable to write log file, please make &quot;<?php echo DNS_DIR; ?>/log/&quot; writable!\r
                                                                <?php } else { ?>\r
                                                                        <b>ID:</b> <code><?php echo $this->getExceptionID(); ?></code><br>\r
-                                                                       <?php echo "Please send the ID above to the site administrator."; ?>\r
+                                                                       Please send the ID above to the site administrator.\r
                                                                <?php } ?>\r
                                                        </p>\r
                                                </div>\r