diff -r 5e7a0fedabdf -r 877f952ae2bd web/lib/Zend/Wildfire/Plugin/FirePhp.php --- a/web/lib/Zend/Wildfire/Plugin/FirePhp.php Thu Mar 21 17:31:31 2013 +0100 +++ b/web/lib/Zend/Wildfire/Plugin/FirePhp.php Thu Mar 21 19:50:53 2013 +0100 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Wildfire * @subpackage Plugin - * @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: FirePhp.php 23066 2010-10-09 23:29:20Z cadorn $ + * @version $Id: FirePhp.php 24593 2012-01-05 20:35:02Z matthew $ */ /** Zend_Controller_Request_Abstract */ @@ -41,7 +41,7 @@ * @category Zend * @package Zend_Wildfire * @subpackage Plugin - * @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_Wildfire_Plugin_FirePhp implements Zend_Wildfire_Plugin_Interface @@ -214,7 +214,7 @@ /** * Get or create singleton instance * - * @param $skipCreate boolean True if an instance should not be created + * @param bool $skipCreate True if an instance should not be created * @return Zend_Wildfire_Plugin_FirePhp */ public static function getInstance($skipCreate=false) @@ -323,11 +323,12 @@ * Starts a group in the Firebug Console * * @param string $title The title of the group + * @param array $options OPTIONAL Setting 'Collapsed' to true will initialize group collapsed instead of expanded * @return TRUE if the group instruction was added to the response headers or buffered. */ - public static function group($title) + public static function group($title, $options=array()) { - return self::send(null, $title, self::GROUP_START); + return self::send(null, $title, self::GROUP_START, $options); } /** @@ -488,6 +489,12 @@ unset($meta['Line']); } + if ($meta['Type'] == self::GROUP_START) { + if (isset($options['Collapsed'])) { + $meta['Collapsed'] = ($options['Collapsed'])?'true':'false'; + } + } + if ($meta['Type'] == self::DUMP) { return $firephp->_recordMessage(self::STRUCTURE_URI_DUMP, @@ -515,7 +522,7 @@ $trace = debug_backtrace(); $trace = array_splice($trace, $options['traceOffset']); - + if (!count($trace)) { return $trace; }