8000 Fixes Fatal Error by havvg · Pull Request #17 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

Fixes Fatal Error #17

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

Closed
wants to merge 2 commits into from
Closed

Fixes Fatal Error #17

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
109288e
[WebProfiler] use SafeDecorator on index
havvg Oct 10, 2010
cef0201
Merge branch 'master' of git://github.com/symfony/symfony
havvg Nov 10, 2010
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
Prev Previous commit
Merge branch 'master' of git://github.com/symfony/symfony 
Conflicts:
	src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/request_panel.php
  • Loading branch information
@havvg
havvg committed Nov 10, 2010
commit cef020118a1c51c76a582c0d3163f08a1e0d0779
34 changes: 18 additions & 16 deletions src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/request_panel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,20 +42,22 @@
<th>Value</th>
</tr>

<?php foreach ($data->getSessionAttributes() as $key => $value): ?>
<tr>
<th><?php echo $key ?></th>
<td>
<?php if (is_object($value)): ?>
<em>Object</em>
<?php elseif (is_resource($value)): ?>
<em>Resource</em>
<?php elseif (is_array($value)): ?>
<em>Array</em>
<?php else: ?>
<?php echo $value ?>
<?php endif; ?>
</td>
</tr>
<?php endforeach; ?>
<?php if (count($sessionAttributes = $data->getSessionAttributes())):?>
<?php foreach ($sessionAttributes->getRawValue() as $key => $value): ?>
<tr>
<th><?php echo $key ?></th>
<td>
<?php if (is_object($value)): ?>
<em>Object</em>
<?php elseif (is_resource($value)): ?>
<em>Resource</em>
<?php elseif (is_array($value)): ?>
<em>Array</em>
<?php else: ?>
<?php echo $value ?>
<?php endif; ?>
</td>
</tr>
<?php endforeach; ?>
<?php endif; ?>
</table>
You are viewing a condensed version of this merge commit. You can view the full changes here.
0