Commit cc9c3778 authored by Sylvain's avatar Sylvain

Compiler - garder les messages Flash à la compilation

parent 7416d9cf
......@@ -18,8 +18,18 @@ class Compiler
*/
public function handle($request, Closure $next, $guard = null)
{
$reflash = $request->session()->get('reflash');
if (SettingService::get('cache') != 1) {
// Sauvegarde des messages flash
$availables_flash = ['errors', '_old_input', 'alert-success', 'alert-error', 'success', 'info', 'warning', 'error', 'danger'];
$messages_flash = [];
foreach ($availables_flash as $key) {
if ($request->session()->has($key)) {
$messages_flash[$key] = $request->session()->get($key);
}
}
if (setting('cache') != 1) {
CompilerService::clearAll();
}
......@@ -31,6 +41,19 @@ class Compiler
CompilerService::createBackCSSIfNotExists();
CompilerService::createBackJSIfNotExists();
if (count($messages_flash) > 0 && !$reflash) {
// Préserve les messages flash
foreach ($messages_flash as $key => $message) {
$request->session()->flash($key, $message);
}
// Evite la récursivité
$request->session()->flash('reflash', true);
} else {
$request->session()->forget('reflash');
}
return $next($request);
}
}
......@@ -127,8 +127,10 @@ class Parser
*/
private function replaceTagNoRender(&$html)
{
$html = str_replace('{#', '{!!', $html);
$html = str_replace('#}', '!!}', $html);
$html = str_replace('{#', '{{', $html);
$html = str_replace('#}', '}}', $html);
$html = str_replace('{##', '{!!', $html);
$html = str_replace('##}', '!!}', $html);
$html = str_replace('{@}', '@', $html);
$html = str_replace('<#php', '<?php', $html);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment