diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php
index b36df42b..5c0952b9 100644
--- a/libs/Smarty.class.php
+++ b/libs/Smarty.class.php
@@ -907,12 +907,22 @@ class Smarty
      */    
     function clear_cache($tpl_file = null, $cache_id = null, $compile_id = null, $exp_time = null)
     {
-        /* the use of $compile_id is deprecated, so it is ignored */
+        
+        if (!isset($compile_id))
+            $compile_id = $this->compile_id;
+
+        if (isset($cache_id))
+            $auto_id = (isset($compile_id)) ? $compile_id . '|' . $cache_id : $cache_id;
+        elseif(isset($compile_id))
+            $auto_id = $compile_id;
+        else
+            $auto_id = null;
+
         if (!empty($this->cache_handler_func)) {
             $funcname = $this->cache_handler_func;
-            return $funcname('clear', $this, $dummy, $tpl_file, $cache_id, null);
+            return $funcname('clear', $this, $dummy, $tpl_file, $cache_id, $compile_id);
         } else {
-            return $this->_rm_auto($this->cache_dir, $tpl_file, $cache_id, $exp_time);
+            return $this->_rm_auto($this->cache_dir, $tpl_file, $auto_id, $exp_time);
         }
         
     }
@@ -2275,14 +2285,14 @@ class Smarty
         } else {
             // use local cache file
             if (isset($cache_id))
-                $_auto_id = (isset($compile_id)) ? $cache_id . '|' .  $compile_id : $cache_id;
+                $auto_id = (isset($compile_id)) ? $compile_id . '|' . $cache_id : $cache_id;
             elseif(isset($compile_id))
-                $_auto_id = $compile_id;
+                $auto_id = $compile_id;
             else
-                $_auto_id = null;
+                $auto_id = null;
 
-            $_cache_file = $this->_get_auto_filename($this->cache_dir, $tpl_file, $_auto_id);
-            $this->_write_file($_cache_file, $results, true);
+            $cache_file = $this->_get_auto_filename($this->cache_dir, $tpl_file, $auto_id);
+            $this->_write_file($cache_file, $results, true);
             return true;
         }
     }
@@ -2312,19 +2322,19 @@ class Smarty
 
         if (!empty($this->cache_handler_func)) {
             // use cache_handler function
-            $_funcname = $this->cache_handler_func;
-            $_funcname('read', $this, $results, $tpl_file, $cache_id, $compile_id);
+            $funcname = $this->cache_handler_func;
+            $funcname('read', $this, $results, $tpl_file, $cache_id, $compile_id);
         } else {
             // use local cache file
             if (isset($cache_id))
-                $_auto_id = (isset($compile_id)) ?  $cache_id . '|' . $compile_id : $cache_id;
+                $auto_id = (isset($compile_id)) ? $compile_id . '|' . $cache_id : $cache_id;
             elseif(isset($compile_id))
-                $_auto_id = $compile_id;
+                $auto_id = $compile_id;
             else
-                $_auto_id = null;
+                $auto_id = null;
 
-            $_cache_file = $this->_get_auto_filename($this->cache_dir, $tpl_file, $_auto_id);
-            $results = $this->_read_file($_cache_file);
+            $cache_file = $this->_get_auto_filename($this->cache_dir, $tpl_file, $auto_id);
+            $results = $this->_read_file($cache_file);
         }
 
         if (empty($results)) {
@@ -2332,10 +2342,10 @@ class Smarty
             return false;
         }
 
-        $_cache_split = explode("\n", $_results, 2);
-        $_cache_header = $_cache_split[0];
+        $cache_split = explode("\n", $results, 2);
+        $cache_header = $cache_split[0];
 
-        $this->_cache_info = unserialize($_cache_header);
+        $this->_cache_info = unserialize($cache_header);
 
         if ($this->caching == 2 && isset ($this->_cache_info['expires'])){
             // caching by expiration time
@@ -2370,7 +2380,7 @@ class Smarty
             }
         }
 
-        $results = $_cache_split[1];
+        $results = $cache_split[1];
         $content_cache["$tpl_file,$cache_id,$compile_id"] = array($results, $this->_cache_info);
 
         return true;