8000 [Profiler] Ajax by vicb · Pull Request #3340 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[Profiler] Ajax #3340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 15, 2012
Merged

[Profiler] Ajax #3340

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Symfony\Component\HttpFoundation\Session\Flash\AutoExpireFlashBag;
use Symfony\Component\HttpFoundation\Request;

/**
* ProfilerController.
Expand All @@ -27,11 +28,12 @@ class ProfilerController extends ContainerAware
/**
* Renders a profiler panel for the given token.
*
* @param string $token The profiler token
* @param Request $request The HTTP request
* @param string $token The profiler token
*
* @return Response A Response instance
*/
public function panelAction($token)
public function panelAction(Request $request, $token)
{
$profiler = $this->container->get('profiler');
$profiler->disable();
Expand All @@ -54,6 +56,7 @@ public function panelAction($token)
'panel' => $panel,
'page' => $page,
'templates' => $this->getTemplates($profiler),
'is_ajax' => $request->isXmlHttpRequest(),
));
}

Expand Down
0