diff options
Diffstat (limited to 'system/database')
-rw-r--r-- | system/database/DB_cache.php | 6 | ||||
-rw-r--r-- | system/database/DB_driver.php | 17 |
2 files changed, 20 insertions, 3 deletions
diff --git a/system/database/DB_cache.php b/system/database/DB_cache.php index 913140f6c..bb2b47b7b 100644 --- a/system/database/DB_cache.php +++ b/system/database/DB_cache.php @@ -97,7 +97,7 @@ class CI_DB_Cache { return $this->obj->db->cache_off(); } - $uri = ($this->obj->uri->segment(1) == FALSE) ? 'default_' : $this->obj->uri->segment(1).'_'; + $uri = ($this->obj->uri->segment(1) == FALSE) ? 'default.' : $this->obj->uri->segment(1).'.'; $uri .= ($this->obj->uri->segment(2) == FALSE) ? 'index' : $this->obj->uri->segment(2); $filepath = $uri.'/'.md5($sql); @@ -125,7 +125,7 @@ class CI_DB_Cache { return $this->obj->db->cache_off(); } - $uri = ($this->obj->uri->segment(1) == FALSE) ? 'default_' : $this->obj->uri->segment(1).'_'; + $uri = ($this->obj->uri->segment(1) == FALSE) ? 'default.' : $this->obj->uri->segment(1).'.'; $uri .= ($this->obj->uri->segment(2) == FALSE) ? 'index' : $this->obj->uri->segment(2); $dir_path = $this->obj->db->cachedir.$uri.'/'; @@ -171,7 +171,7 @@ class CI_DB_Cache { $segment_two = ($this->obj->uri->segment(2) == FALSE) ? 'index' : $this->obj->uri->segment(2); } - $dir_path = $this->obj->db->cachedir.md5($segment_one.'_'.$segment_two).'/'; + $dir_path = $this->obj->db->cachedir.md5($segment_one.'.'.$segment_two).'/'; delete_files($dir_path, TRUE); } diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php index e8c4a8236..b89ebbf8d 100644 --- a/system/database/DB_driver.php +++ b/system/database/DB_driver.php @@ -156,6 +156,23 @@ class CI_DB_driver { } } + // -------------------------------------------------------------------- + + /** + * Load the Utilities Class + * + * @access public + * @return string + */ + function load_utilities() + { + $obj =& get_instance(); + + require_once(BASEPATH.'database/DB_utility'.EXT); + require_once(BASEPATH.'database/drivers/'.$this->dbdriver.'/'.$this->dbdriver.'_utility'.EXT); + $class = 'CI_DB_'.$this->dbdriver.'_utility'; + $obj->dbutil = new $class(); + } // -------------------------------------------------------------------- |