Overview
Comment:Handle HTML error messages in error page
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 77f314fde91726af88981956fbd47e406cb7472f0b1791f7dd876c3b3795bd79
User & Date: bohwaz on 2022-05-13 12:59:53
Other Links: manifest | tags
Context
2022-05-13
13:31
Rename accueil.banniere signal to home.banner check-in: 2b86db45b5 user: bohwaz tags: trunk
12:59
Handle HTML error messages in error page check-in: 77f314fde9 user: bohwaz tags: trunk
00:27
Add stable tag to trunk check-in: f9a3e80584 user: bohwaz tags: trunk, stable
Changes

Modified src/include/init.php from [2c1844b15d] to [d1e6e9ff62].

400
401
402
403
404
405
406

407
408
409
410
411
412
413
		echo $e->getMessage();
	}
	else
	{
		$tpl = Template::getInstance();

		$tpl->assign('error', $e->getMessage());

		$tpl->assign('admin_url', ADMIN_URL);
		$tpl->display('error.tpl');
	}

	exit;
}








>







400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
		echo $e->getMessage();
	}
	else
	{
		$tpl = Template::getInstance();

		$tpl->assign('error', $e->getMessage());
		$tpl->assign('html_error', $e->getHTMLMessage());
		$tpl->assign('admin_url', ADMIN_URL);
		$tpl->display('error.tpl');
	}

	exit;
}

Modified src/templates/error.tpl from [6a0842893f] to [67cba6eb16].

30
31
32
33
34
35
36



37

38
39
40
41
42
43
44
45
</head>

<body>

<h1>{if empty($title)}Erreur{else}{$title}{/if}</h1>

<p class="block error">



    {$error|escape|nl2br}

</p>

<p>
    <a href="{$admin_url}" onclick="history.back(); return false;">&larr; Retour</a>
</p>

</body>
</html>







>
>
>
|
>








30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
</head>

<body>

<h1>{if empty($title)}Erreur{else}{$title}{/if}</h1>

<p class="block error">
    {if $html_error}
        {$html_error|raw}
    {else}
        {$error|escape|nl2br}
    {/if}
</p>

<p>
    <a href="{$admin_url}" onclick="history.back(); return false;">&larr; Retour</a>
</p>

</body>
</html>