Merge branch '2.0'

* 2.0: [HttpKernel] fixed profile saving when it has children
symfony · Oct 14, 2011 · 7816290 · 7816290
2 parents 4dc5953 + c0f5b8a
commit 7816290
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php b/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php
@@ -91,11 +91,12 @@ public function onKernelResponse(FilterResponseEvent $event)
 
         if ($profile = $this->profiler->collect($event->getRequest(), $event->getResponse(), $exception)) {
             if ($master) {
-                $this->profiler->saveProfile($profile);
                 foreach ($this->children as $child) {
                     $child->setParent($profile);
+                    $profile->addChild($child);
                     $this->profiler->saveProfile($child);
                 }
+                $this->profiler->saveProfile($profile);
                 $this->children = array();
             } else {
                 $this->children[] = $profile;