From 256a18c50f0c042ae80d931ab3bd54b09f0fafa0 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@bofh.bg>
Date: Tue, 23 Oct 2012 12:18:32 +0300
Subject: Fix issues #134, #1911

---
 system/database/DB_cache.php   | 16 +++++-----------
 system/helpers/file_helper.php |  2 +-
 2 files changed, 6 insertions(+), 12 deletions(-)

(limited to 'system')

diff --git a/system/database/DB_cache.php b/system/database/DB_cache.php
index ba9110382..bdd91867a 100644
--- a/system/database/DB_cache.php
+++ b/system/database/DB_cache.php
@@ -43,6 +43,8 @@ class CI_DB_Cache {
 		$this->CI =& get_instance();
 		$this->db =& $db;
 		$this->CI->load->helper('file');
+
+		$this->check_path();
 	}
 
 	// --------------------------------------------------------------------
@@ -66,7 +68,9 @@ class CI_DB_Cache {
 		}
 
 		// Add a trailing slash to the path if needed
-		$path = preg_replace('/(.+?)\/*$/', '\\1/',  $path);
+		$path = realpath($path)
+			? rtrim(realpath($path), DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR
+			: rtrim($path, '/').'/';
 
 		if ( ! is_dir($path) OR ! is_really_writable($path))
 		{
@@ -90,11 +94,6 @@ class CI_DB_Cache {
 	 */
 	public function read($sql)
 	{
-		if ( ! $this->check_path())
-		{
-			return $this->db->cache_off();
-		}
-
 		$segment_one = ($this->CI->uri->segment(1) == FALSE) ? 'default' : $this->CI->uri->segment(1);
 		$segment_two = ($this->CI->uri->segment(2) == FALSE) ? 'index' : $this->CI->uri->segment(2);
 		$filepath = $this->db->cachedir.$segment_one.'+'.$segment_two.'/'.md5($sql);
@@ -116,11 +115,6 @@ class CI_DB_Cache {
 	 */
 	public function write($sql, $object)
 	{
-		if ( ! $this->check_path())
-		{
-			return $this->db->cache_off();
-		}
-
 		$segment_one = ($this->CI->uri->segment(1) == FALSE) ? 'default' : $this->CI->uri->segment(1);
 		$segment_two = ($this->CI->uri->segment(2) == FALSE) ? 'index' : $this->CI->uri->segment(2);
 		$dir_path = $this->db->cachedir.$segment_one.'+'.$segment_two.'/';
diff --git a/system/helpers/file_helper.php b/system/helpers/file_helper.php
index e68bb7f7a..441345b05 100644
--- a/system/helpers/file_helper.php
+++ b/system/helpers/file_helper.php
@@ -109,7 +109,7 @@ if ( ! function_exists('delete_files'))
 	function delete_files($path, $del_dir = FALSE, $level = 0, $htdocs = FALSE)
 	{
 		// Trim the trailing slash
-		$path = rtrim($path, DIRECTORY_SEPARATOR);
+		$path = rtrim($path, '/\\');
 
 		if ( ! $current_dir = @opendir($path))
 		{
-- 
cgit v1.2.3-24-g4f1b