From b25f400cd6bc255b01e05ac274f050ba4039a411 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Mon, 21 Dec 2015 05:41:34 -0500
Subject: [PATCH] Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3
---
server/lib/classes/tpl_cache.inc.php | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/server/lib/classes/tpl_cache.inc.php b/server/lib/classes/tpl_cache.inc.php
index 4bf75fa..ce8a5b1 100644
--- a/server/lib/classes/tpl_cache.inc.php
+++ b/server/lib/classes/tpl_cache.inc.php
@@ -101,8 +101,8 @@
* FUNCTION: _checkCache
* checks if there's a cache, if there is then it will read the cache file as the template.
*/
- function _checkCache ($tmplfile) {
- $this->_cachefile = $this->_getFilename($tmplfile);
+ function _checkCache ($tmplfile, $tmpl_from_string = false) {
+ $this->_cachefile = $this->_getFilename($tmplfile, $tmpl_from_string);
if ($this->_clearcache) {
if (file_exists($this->_cachefile)) unlink($this->_cachefile);
return false;
@@ -133,8 +133,9 @@
* gets the full pathname for the cached file
*
*/
- function _getFilename($tmplfile) {
- return $this->OPTIONS['CACHE_DIRECTORY'].'/'.md5('vlibCachestaR'.realpath($tmplfile)).'.'.$this->OPTIONS['CACHE_EXTENSION'];
+ function _getFilename($tmplfile, $tmpl_from_string = false) {
+ if($tmpl_from_string == true) return $this->OPTIONS['CACHE_DIRECTORY'].'/'.md5('vlibCachestaRSTRING'.$tmplfile).'.'.$this->OPTIONS['CACHE_EXTENSION'];
+ else return $this->OPTIONS['CACHE_DIRECTORY'].'/'.md5('vlibCachestaR'.realpath($tmplfile)).'.'.$this->OPTIONS['CACHE_EXTENSION'];
}
--
Gitblit v1.9.1