From ab5ff5126ef56b08f5130a9e110b53c00d0a2761 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Tue, 8 Apr 2014 21:19:12 +0200 Subject: [PATCH] - remove triplle extension (.tpl.cache.php) - ignored only new cache files - missed to use getPath() to generate FQFN (full-qualified file name) for template cache file MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .gitignore | 21 ++++++++++----------- inc/template-functions.php | 3 ++- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 7a1324326a..1fd8eadacc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,21 +1,20 @@ -/.cache -/.project -/.settings -/core +/.cache/ +/.project/ +/.settings/ +/core/ DOCS/*.log DOCS/doxygen/*.tmp -DOCS/doxygen/html -inc/.secret -inc/cache/*.cache +DOCS/doxygen/html/ +inc/.secret/ inc/cache/*.cache.php inc/cache/*.log inc/cache/*.rss inc/cache/.revision -inc/cache/_compiled/email/*.cache -inc/cache/_compiled/html/*.cache -inc/cache/_compiled/xml/*.cache +inc/cache/_compiled/email/*.cache.php +inc/cache/_compiled/html/*.cache.php +inc/cache/_compiled/xml/*.cache.php inc/cache/config-local.php inc/cache/sess_* -/nbproject +/nbproject/ theme/org/css/aboutme.css contrib/seitwert_www_mxchange_org.pdf diff --git a/inc/template-functions.php b/inc/template-functions.php index 56eb35dc84..5eb84e4339 100644 --- a/inc/template-functions.php +++ b/inc/template-functions.php @@ -1931,7 +1931,8 @@ function generateCacheFqfn ($prefix, $template) { if (!isset($GLOBALS['template_cache_fqfn'][$prefix][$template])) { // Generate the FQFN $GLOBALS['template_cache_fqfn'][$prefix][$template] = sprintf( - '%s_compiled/%s/%s.tpl%s', + '%s%s_compiled/%s/%s%s', + getPath(), getCachePath(), $prefix, $template, -- 2.39.5