[geeklog-hg] geeklog: Bug when deleting a cache instance if id of object (sto...

[geeklog-cvs at lists.geeklog.net]

changeset 9302:7e15f915da0e
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/7e15f915da0e
user: Tom <websitemaster at cogeco.net>
date: Mon Sep 16 21:28:10 2013 -0400
description:
Bug when deleting a cache instance if id of object (story, staticpage, etc) had a dash in it.

diffstat:

 system/classes/template.class.php |  6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diffs (16 lines):

diff -r 61645d55e776 -r 7e15f915da0e system/classes/template.class.php
--- a/system/classes/template.class.php	Mon Sep 16 20:56:20 2013 -0400
+++ b/system/classes/template.class.php	Mon Sep 16 21:28:10 2013 -0400
@@ -2052,7 +2052,11 @@
     global $TEMPLATE_OPTIONS;
 
     $iid = str_replace(array('..', '/', '\\', ':'), '', $iid);
-    $iid = str_replace('-','_',$iid);
+    // COMMENT ORIGINAL LINE below out since not sure why changing dashes to under scores
+    // When creating the cache file we use COM_sanitizeFilename which doesn't change dashes so 
+    // no need to change here when deleting cache file (since names will not match).
+    // Dashes can be used in ids like with blocks, articles, and staticpages
+    // $iid = str_replace('-','_',$iid); 
     $path_cache = substr($TEMPLATE_OPTIONS['path_cache'], 0, -1);
     CACHE_clean_directories($path_cache, 'instance__'.$iid);
 }