} catch (ShaarliFrontException $e) {
// Possible functional error
$this->container->pageBuilder->reset();
- $this->container->pageBuilder->assign('message', $e->getMessage());
+ $this->container->pageBuilder->assign('message', nl2br($e->getMessage()));
$response = $response->withStatus($e->getCode());
return $response->write($this->container->pageBuilder->render('error'));
} catch (UnauthorizedException $e) {
- return $response->withRedirect($this->container->basePath . '/login');
+ $returnUrl = urlencode($this->container->environment['REQUEST_URI']);
+
+ return $response->withRedirect($this->container->basePath . '/login?returnurl=' . $returnUrl);
} catch (\Throwable $e) {
// Unknown error encountered
$this->container->pageBuilder->reset();