Skip to content

[3.10] Clear buffered output at all levels #30786

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
richard67 merged 7 commits into from
Jan 19, 2021
Merged

[3.10] Clear buffered output at all levels #30786

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0fcd11f
Clear buffered output at all levels
zero-24 Sep 27, 2020
0fda10a
Update ExceptionHandler.php
zero-24 Sep 27, 2020
6aa6fd0
Update ExceptionHandler.php
zero-24 Oct 3, 2020
0057e44
Update ExceptionHandler.php
zero-24 Oct 3, 2020
a963ebc
Merge branch '3.10-dev' into redirect_plugin
zero-24 Oct 17, 2020
67fcec8
Merge branch '3.10-dev' into redirect_plugin
zero-24 Jan 19, 2021
cf05edb
Merge branch '3.10-dev' into redirect_plugin
richard67 Jan 19, 2021
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
12 changes: 9 additions & 3 deletions libraries/src/Exception/ExceptionHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,14 @@ public static function render($error)
// Push the error object into the document
$document->setError($error);

// Clear buffered output at all levels in non-test mode
$callerFunction = static::getCallerFunctionName();
// Clear buffered output at all levels
while (ob_get_level())
{
ob_end_clean();
}

// This is needed to ensure the test suite can still get the output buffer
ob_start();

$document->setTitle(Text::_('ERROR') . ': ' . $error->getCode());

Expand Down Expand Up @@ -176,7 +182,7 @@ public static function render($error)
protected static function getCallerFunctionName()
Copy link
Contributor

@wilsonge wilsonge Jan 27, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@zero-24 I think this function can be removed now - it's not longer being called

Copy link
Contributor Author

@zero-24 zero-24 Jan 27, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it could be used as its part of the API right? It can be removed with 4 i guess right?

Copy link
Contributor

@wilsonge wilsonge Jan 27, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's a protected function and introduced in 3.10 - its only been in alpha's so far?

Copy link
Contributor Author

@zero-24 zero-24 Jan 27, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah ok will do a PR to get rid of it.

Copy link
Contributor Author

@zero-24 zero-24 Jan 27, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PR done: #32175

{
$backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);

return isset($backtrace[2]['function']) ? $backtrace[2]['function'] : false;
}

Expand Down