From b1787d0b2301af155d43149cf105abab2f96090c Mon Sep 17 00:00:00 2001
From: messju <messju@localhost>
Date: Fri, 21 Mar 2003 09:07:57 +0000
Subject: [PATCH] swapped compile_id and cache_id in read_cache_file and
 write_cache_file

---
 NEWS                  | 3 +++
 libs/Smarty.class.php | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 803d27a5..2c611c12 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+    - swapped compile_id and cache_id in read_cache_file and write_cache_file
+      (messju)
+    - reverted patch for cache-file-handling (messju)
     - made html_radios and html_checkboxes accept "selected" instead
       of "checked" optionally. (messju)
     - made compile_id ignored in clear_cache, made order of
diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php
index 5c0952b9..f0e98841 100644
--- a/libs/Smarty.class.php
+++ b/libs/Smarty.class.php
@@ -912,7 +912,7 @@ class Smarty
             $compile_id = $this->compile_id;
 
         if (isset($cache_id))
-            $auto_id = (isset($compile_id)) ? $compile_id . '|' . $cache_id : $cache_id;
+            $auto_id = (isset($compile_id)) ? $cache_id . '|' . $compile_id : $cache_id;
         elseif(isset($compile_id))
             $auto_id = $compile_id;
         else
@@ -2285,7 +2285,7 @@ class Smarty
         } else {
             // use local cache file
             if (isset($cache_id))
-                $auto_id = (isset($compile_id)) ? $compile_id . '|' . $cache_id : $cache_id;
+                $auto_id = (isset($compile_id)) ? $cache_id . '|' . $compile_id : $cache_id;
             elseif(isset($compile_id))
                 $auto_id = $compile_id;
             else