Changeset 6869

Timestamp:

01/01/08 02:52:18 (1 year ago)

Author:

dwhittle

Message:

1.1: made web debug class customizable in web debug logger

Files:

• branches/1.1/lib/log/sfWebDebugLogger.class.php (modified) (4 diffs)

branches/1.1/lib/log/sfWebDebugLogger.class.php

@@ -4 +4 @@
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- 
+
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
@@ -35 +35 @@
-  public function initialize(sfEventDispatcher $dispatcher, $options = array())
-  {
-    $this->webDebug   = new sfWebDebug();
-    $this->context    = sfContext::getInstance();
-    $this->dispatcher = $dispatcher;
-
-    $dispatcher->connect('response.filter_content', array($this, 'filterResponseContent'));
+
+    if(is_null($this->webDebug))
+    {
+      $this->webDebug = $this->context->has('sf_web_debug') ? $this->context->get('sf_web_debug') : new sfWebDebug();
+    }
+
+    $this->context->set('sf_web_debug', $this->webDebug);
-
-    if (isset($options['xdebug_logging']))
@@ -90 +96 @@
-
-    // add needed assets for the web debug toolbar
- 
+
-    $assets = sprintf('
-      <script type="text/javascript" src="%s"></script>
@@ -121 +127 @@
-    // if we have xdebug and dev has not disabled the feature, add some stack information
-    $debugStack = array();
-function_exists('xdebug_get_function_stack') && $this->xdebugLogging
+$this->xdebugLogging && function_exists('xdebug_get_function_stack')
-    {
-      foreach (xdebug_get_function_stack() as $i => $stack)