move properties into classes where they better belong to

libs/sysplugins/smarty_internal_template.php

@@ -19,35 +19,18 @@
  */
 class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
 {
-    /**
-     * cache_id
-     *
-     * @var string
-     */
-    public $cache_id = null;
-    /**
-     * $compile_id
-     * @var string
-     */
-    public $compile_id = null;
-    /**
-     * caching enabled
-     *
-     * @var boolean
-     */
-    public $caching = null;
-    /**
-     * cache lifetime in seconds
-     *
-     * @var integer
-     */
-    public $cache_lifetime = null;
     /**
      * Template resource
      *
      * @var string
      */
     public $template_resource = null;
+    /**
+     * Saved template Id
+     *
+     * @var null|string
+     */
+    public $templateId = null;
     /**
      * flag if compiled template is invalid and must be (re)compiled
      *
@@ -68,7 +51,6 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
     public $properties = array('file_dependency' => array(),
                                'nocache_hash'    => '',
                                'tpl_function'    => array(),
-                               'type'            => 'compiled',
     );
     /**
      * required plugins
@@ -76,12 +58,6 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
      * @var array
      */
     public $required_plugins = array('compiled' => array(), 'nocache' => array());
-    /**
-     * Global smarty instance
-     *
-     * @var Smarty
-     */
-    public $smarty = null;
     /**
      * blocks for template inheritance
      *

libs/sysplugins/smarty_internal_templatebase.php

@@ -16,6 +16,38 @@
  */
 abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data
 {
+    /**
+     * Global smarty instance
+     *
+     * @var Smarty
+     */
+    public $smarty = null;
+    /**
+     * Set this if you want different sets of cache files for the same
+     * templates.
+     *
+     * @var string
+     */
+    public $cache_id = null;
+    /**
+     * Set this if you want different sets of compiled files for the same
+     * templates.
+     *
+     * @var string
+     */
+    public $compile_id = null;
+    /**
+     * caching enabled
+     *
+     * @var boolean
+     */
+    public $caching = false;
+    /**
+     * cache lifetime in seconds
+     *
+     * @var integer
+     */
+    public $cache_lifetime = 3600;
     /**
      * fetches a rendered Smarty template
      *