diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merged branch yethee/profile_toolbar (PR #3336)

Browse Source 
Commits
-------

6e9f886 [WebProfilerBundle] moved variable initialization from condition

Discussion
----------

[WebProfilerBundle] moved variable initialization from condition

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: -
Todo: -

I got fatal error for the original condition on PHP 5.3.8:

    Fatal error: Call to a member function getFlashBag() on a non-object in /home/context/httpd/vendor/symfony/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php on line 150
This commit is contained in:
Fabien Potencier 2012-02-12 13:10:29 +01:00
commit 8adefb55e8
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
View File

@ -146,8 +146,9 @@ class ProfilerController extends ContainerAware
public function toolbarAction($token, $position = null)
{
$request = $this->container->get('request');
$session = $request->getSession();
if (null !== $session = $request->getSession() && $session->getFlashBag() instanceof AutoExpireFlashBag) {
if (null !== $session && $session->getFlashBag() instanceof AutoExpireFlashBag) {
// keep current flashes for one more request if using AutoExpireFlashBag
$session->getFlashBag()->setAll($session->getFlashBag()->peekAll());
}