From 07d5e9974d6158b519fab619f186b127afebccb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come.chilliet@fusiondirectory.org>
Date: Tue, 7 Jul 2020 09:40:31 +0200
Subject: [PATCH] :ambulance: fix(errors) Fix a PHP error and hook error
content
<p> cannot contain <pre> so we cannot use <pre> in hook error content.
issue #6071
---
include/errors/class_SimplePluginError.inc | 2 +-
include/errors/class_SimplePluginHookError.inc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/errors/class_SimplePluginError.inc b/include/errors/class_SimplePluginError.inc
index 3fdf05a88..6fbccc78c 100644
--- a/include/errors/class_SimplePluginError.inc
+++ b/include/errors/class_SimplePluginError.inc
@@ -48,7 +48,7 @@ class SimplePluginError extends FusionDirectoryError
} elseif ($origin instanceof simpleTabs) {
$this->tab = NULL;
$this->object = $origin;
- } else {
+ } elseif ($origin !== NULL) {
trigger_error('Invalid origin of class '.get_class($origin));
}
}
diff --git a/include/errors/class_SimplePluginHookError.inc b/include/errors/class_SimplePluginHookError.inc
index d235cb194..86f35c889 100644
--- a/include/errors/class_SimplePluginHookError.inc
+++ b/include/errors/class_SimplePluginHookError.inc
@@ -29,7 +29,7 @@ class SimplePluginHookError extends SimplePluginError
{
$this->hookType = $type;
- parent::__construct($origin, '<pre><samp>'.htmlescape($output).'</samp></pre>', $code, $previous);
+ parent::__construct($origin, nl2br('<samp>'.htmlescape($output).'</samp>'), $code, $previous);
}
public function toArray (): array
--
GitLab