diff options
Diffstat (limited to 'libs/Zend/Cache/Frontend/Class.php')
| -rw-r--r-- | libs/Zend/Cache/Frontend/Class.php | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/libs/Zend/Cache/Frontend/Class.php b/libs/Zend/Cache/Frontend/Class.php index 3dbdcf666b..6c4ef471b8 100644 --- a/libs/Zend/Cache/Frontend/Class.php +++ b/libs/Zend/Cache/Frontend/Class.php @@ -15,21 +15,21 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Frontend - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Class.php 20379 2010-01-18 14:40:57Z mabe $ + * @version $Id: Class.php 16541 2009-07-07 06:59:03Z bkarwin $ */ /** * @see Zend_Cache_Core */ -// require_once 'Zend/Cache/Core.php'; +require_once 'Zend/Cache/Core.php'; /** * @package Zend_Cache * @subpackage Zend_Cache_Frontend - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cache_Frontend_Class extends Zend_Cache_Core @@ -208,14 +208,14 @@ class Zend_Cache_Frontend_Class extends Zend_Cache_Core // We do not have not cache return call_user_func_array(array($this->_cachedEntity, $name), $parameters); } - $id = $this->_makeId($name, $parameters); - if ( ($rs = $this->load($id)) && isset($rs[0], $rs[1]) ) { + if ($this->test($id)) { // A cache is available - $output = $rs[0]; - $return = $rs[1]; + $result = $this->load($id); + $output = $result[0]; + $return = $result[1]; } else { - // A cache is not available (or not valid for this frontend) + // A cache is not available ob_start(); ob_implicit_flush(false); $return = call_user_func_array(array($this->_cachedEntity, $name), $parameters); @@ -224,7 +224,6 @@ class Zend_Cache_Frontend_Class extends Zend_Cache_Core $data = array($output, $return); $this->save($data, $id, $this->_tags, $this->_specificLifetime, $this->_priority); } - echo $output; return $return; } |