From 1378f79297baa84590738839ec11cef90ac21bc4 Mon Sep 17 00:00:00 2001 From: robocoder Date: Fri, 29 Jan 2010 09:02:30 +0000 Subject: update wrt Zend Framework 1.10.0; remove svn:eol-style property git-svn-id: http://dev.piwik.org/svn/trunk@1813 59fd770c-687e-43c8-a1e3-f5a4ff64c105 --- libs/Zend/Db/Profiler/Firebug.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libs/Zend/Db/Profiler/Firebug.php') diff --git a/libs/Zend/Db/Profiler/Firebug.php b/libs/Zend/Db/Profiler/Firebug.php index 85fcc2f9b8..6be53add05 100644 --- a/libs/Zend/Db/Profiler/Firebug.php +++ b/libs/Zend/Db/Profiler/Firebug.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Profiler - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Firebug.php 18951 2009-11-12 16:26:19Z alexander $ + * @version $Id: Firebug.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** Zend_Db_Profiler */ @@ -35,7 +35,7 @@ require_once 'Zend/Wildfire/Plugin/FirePhp/TableMessage.php'; * @category Zend * @package Zend_Db * @subpackage Profiler - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Db_Profiler_Firebug extends Zend_Db_Profiler @@ -121,9 +121,9 @@ class Zend_Db_Profiler_Firebug extends Zend_Db_Profiler */ public function queryEnd($queryId) { - parent::queryEnd($queryId); + $state = parent::queryEnd($queryId); - if (!$this->getEnabled()) { + if (!$this->getEnabled() || $state == self::IGNORED) { return; } -- cgit v1.2.3