From 5ae5a6f576ffd12417f2728e7c860194c9b9a406 Mon Sep 17 00:00:00 2001
From: mohrt <mohrt@localhost>
Date: Wed, 25 Jun 2003 21:50:34 +0000
Subject: [PATCH] fix SMARTY_COMPILE_DIR_SEP problem, make local var

---
 libs/Smarty.class.php                     |  4 ++--
 libs/core/core.assemble_auto_filename.php | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php
index 10b1bbb4..1cbbfd23 100644
--- a/libs/Smarty.class.php
+++ b/libs/Smarty.class.php
@@ -1165,13 +1165,13 @@ class Smarty
     {
         static $_cache_info = array();
 
-		define('SMARTY_COMPILE_DIR_SEP', $this->use_sub_dirs ? DIRECTORY_SEPARATOR : '^');
+		$_compile_dir_sep =  $this->use_sub_dirs ? DIRECTORY_SEPARATOR : '^';
 		
 		$this->_cache_paths_file =
 				$this->compile_dir
 				. DIRECTORY_SEPARATOR
 				. '_smarty_cached_paths'
-				. SMARTY_COMPILE_DIR_SEP
+				. $_compile_dir_sep
 				. urlencode($resource_name)
 				. '.php';
 
diff --git a/libs/core/core.assemble_auto_filename.php b/libs/core/core.assemble_auto_filename.php
index 04ce72fc..4255c645 100644
--- a/libs/core/core.assemble_auto_filename.php
+++ b/libs/core/core.assemble_auto_filename.php
@@ -18,6 +18,8 @@
 function smarty_core_assemble_auto_filename($params, &$smarty)
 {	
 
+	$_compile_dir_sep =  $this->use_sub_dirs ? DIRECTORY_SEPARATOR : '^';
+		
     if(@is_dir($params['auto_base'])) {
         $_return = $params['auto_base'] . DIRECTORY_SEPARATOR;
     } else {
@@ -32,17 +34,17 @@ function smarty_core_assemble_auto_filename($params, &$smarty)
         // make auto_id safe for directory names
         $params['auto_id'] = str_replace('%7C','|',(urlencode($params['auto_id'])));
         // split into separate directories
-        $params['auto_id'] = str_replace('|', SMARTY_COMPILE_DIR_SEP, $params['auto_id']);
-        $_return .= $params['auto_id'] . SMARTY_COMPILE_DIR_SEP;
+        $params['auto_id'] = str_replace('|', $_compile_dir_sep, $params['auto_id']);
+        $_return .= $params['auto_id'] . $_compile_dir_sep;
     }
 
     if(isset($params['auto_source'])) {
         // make source name safe for filename
         $_filename = urlencode(basename($params['auto_source']));
-        $_crc32 = crc32($params['auto_source']) . SMARTY_COMPILE_DIR_SEP;
+        $_crc32 = crc32($params['auto_source']) . $_compile_dir_sep;
         // prepend %% to avoid name conflicts with
         // with $params['auto_id'] names
-        $_crc32 = '%%' . substr($_crc32,0,3) . SMARTY_COMPILE_DIR_SEP . '%%' . $_crc32;
+        $_crc32 = '%%' . substr($_crc32,0,3) . $_compile_dir_sep . '%%' . $_crc32;
         $_return .= $_crc32 . $_filename;
     }