@@ -67,7 +67,11 @@ class Cache */ public function library($library, $method, $arguments = array(), $expires = null) { - $this->ci->load->library($library); + if(!in_array(ucfirst($library), $this->ci->load->_ci_classes)) + { + $this->ci->load->library($library); + } + return $this->call($library, $method, $arguments, $expires); } @@ -79,7 +83,11 @@ class Cache */ public function model($model, $method, $arguments = array(), $expires = null) { - $this->ci->load->model($model); + if(!in_array(ucfirst($model), $this->ci->load->_ci_classes)) + { + $this->ci->load->model($model); + } + return $this->call($model, $method, $arguments, $expires); } application/libraries/Cache.php @@ -21,7 +21,7 @@ class Twitter_m extends Model { // Only apply a cache to these methods if( in_array($method, array('public_timeline', 'friends_timeline', 'user_timeline', 'show', 'replies', 'friends', 'followers')) ) { - return $this->cache->model('twitter_lib', $method, $arguments, $this->CI->settings->item('twitter_cache') * 60); + return $this->cache->library('twitter_lib', $method, $arguments, $this->CI->settings->item('twitter_cache') * 60); } // Run as normal without worrying about a cache application/modules/twitter/models/twitter_m.php c36870c9d1fe86aaa03eac0a77fddcb88596fa62 Phil Sturgeon email@philsturgeon.co.uk http://github.com/philsturgeon/pyrocms/commit/e3c21e624e4abc8eca9b61d6b1c0483bdf7a9da4 e3c21e624e4abc8eca9b61d6b1c0483bdf7a9da4 2009-11-04T16:03:55-08:00 2009-11-04T16:03:55-08:00 bug: Lazy-loading in Cachel ibrary was seriously f**king with Twitter and a few other things. (ticket #46) 7378a5ee3342dc410ce41175f6f74f257145c529 Phil Sturgeon email@philsturgeon.co.uk