[geeklog-hg] geeklog: Removed the rest of replacing '-' with '_' in ids for f...

[geeklog-cvs at lists.geeklog.net]

changeset 9322:ce4684a09ccc
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/ce4684a09ccc
user: Tom <websitemaster at cogeco.net>
date: Thu Oct 24 06:53:57 2013 -0400
description:
Removed the rest of replacing '-' with '_' in ids for filenames of cached files since it causes issues

diffstat:

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

diffs (36 lines):

diff -r d4c983313ec2 -r ce4684a09ccc system/classes/template.class.php
--- a/system/classes/template.class.php	Mon Oct 14 11:39:48 2013 -0400
+++ b/system/classes/template.class.php	Thu Oct 24 06:53:57 2013 -0400
@@ -1932,7 +1932,8 @@
           $path_cache .= $_CONF['language'] . '/';
       }
       $iid = str_replace(array('..', '/', '\\', ':'), '', $iid);
-      $iid = str_replace('-','_',$iid);
+      // COMMENT ORIGINAL LINE below out since not sure why changing dashes to under scores ... this affects articles and staticpages
+      // $iid = str_replace('-','_',$iid);
       $filename = $path_cache.'instance__'.$iid.'.php';
       $tmplt = '<!-- begin cached as '.htmlspecialchars($iid)." -->\n"
              . $tmplt
@@ -1976,10 +1977,11 @@
           $path_cache .= $_CONF['language'] . '/';
       }
       $iid = str_replace(array('..', '/', '\\', ':'), '', $iid);
-      $iid = str_replace('-','_',$iid);
+      // COMMENT ORIGINAL LINE below out since not sure why changing dashes to under scores ... this affects articles and staticpages
+      // $iid = str_replace('-','_',$iid);
       $filename = $path_cache.'instance__'.$iid.'.php';
       if (file_exists($filename) && array_key_exists($filevar, $this->file)) {
-          $this->file[$filevar] = $filename;
+          $this->file[$filevar] = $filename; 
           return true;
       }
       return false;
@@ -2054,7 +2056,7 @@
     global $TEMPLATE_OPTIONS;
 
     $iid = str_replace(array('..', '/', '\\', ':'), '', $iid);
-    // COMMENT ORIGINAL LINE below out since not sure why changing dashes to under scores
+    // COMMENT ORIGINAL LINE below out since not sure why changing dashes to under scores ... this affects articles and staticpages
     // When creating the cache instance 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