--- a/web/lib/Zend/Cache/Frontend/Output.php Thu Mar 21 17:31:31 2013 +0100
+++ b/web/lib/Zend/Cache/Frontend/Output.php Thu Mar 21 19:50:53 2013 +0100
@@ -15,9 +15,9 @@
* @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-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
- * @version $Id: Output.php 20096 2010-01-06 02:05:09Z bkarwin $
+ * @version $Id: Output.php 24800 2012-05-13 11:59:32Z mabe $
*/
@@ -30,7 +30,7 @@
/**
* @package Zend_Cache
* @subpackage Zend_Cache_Frontend
- * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Cache_Frontend_Output extends Zend_Cache_Core
@@ -55,7 +55,7 @@
*
* @param string $id Cache id
* @param boolean $doNotTestCacheValidity If set to true, the cache validity won't be tested
- * @param boolean $echoData If set to true, datas are sent to the browser if the cache is hit (simpy returned else)
+ * @param boolean $echoData If set to true, datas are sent to the browser if the cache is hit (simply returned else)
* @return mixed True if the cache is hit (false else) with $echoData=true (default) ; string else (datas)
*/
public function start($id, $doNotTestCacheValidity = false, $echoData = true)
@@ -88,8 +88,7 @@
public function end($tags = array(), $specificLifetime = false, $forcedDatas = null, $echoData = true, $priority = 8)
{
if ($forcedDatas === null) {
- $data = ob_get_contents();
- ob_end_clean();
+ $data = ob_get_clean();
} else {
$data =& $forcedDatas;
}