D524.id1345.diff
No OneTemporary
Actions

Subscribers

None

File Metadata

	Index: branches/5.2.x/core/kernel/managers/url_manager.php
	===================================================================
	--- branches/5.2.x/core/kernel/managers/url_manager.php
	+++ branches/5.2.x/core/kernel/managers/url_manager.php
	@@ -464,8 +464,8 @@
	$not_found = $this->Application->ConfigValue('ErrorTemplate');
	$template = $not_found ? $not_found : 'error_notfound';

	- // Avoid recursion, when attempt is made to show 404 page while on the 404 page.
	- if ( $this->Application->GetVar('t') === $template ) {
	+ // Avoid recursion when requesting 404-page from a 404-page template rendering process.
	+ if ( is_object($this->Application->Parser) && $this->Application->GetVar('t') === $template ) {
	return;
	}