aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2023-06-20 09:05:55 +0200
committerGravatar GitHub <noreply@github.com> 2023-06-20 09:05:55 +0200
commitde59076ae1e17397e3e0a50f31566e21626d8e9d (patch)
tree61ddaeed31d462aba6483da00a48926189b7275d
parent8bf362838e9ef991452afc2ae3ae2e91d915d600 (diff)
Remove unneeded quotes in warning (#5480)
* Remove unneeded quotes in warning fix https://github.com/FreshRSS/FreshRSS/issues/5479 * Minor whitespace
-rw-r--r--app/Models/Feed.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/app/Models/Feed.php b/app/Models/Feed.php
index a27259978..9b9910bff 100644
--- a/app/Models/Feed.php
+++ b/app/Models/Feed.php
@@ -400,8 +400,13 @@ class FreshRSS_Feed extends Minz_Model {
if ((!$mtime) || $simplePie->error()) {
$errorMessage = $simplePie->error();
+ if (empty($errorMessage)) {
+ $errorMessage = '';
+ } elseif (is_array($errorMessage)) {
+ $errorMessage = json_encode($errorMessage, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_LINE_TERMINATORS) ?: '';
+ }
throw new FreshRSS_Feed_Exception(
- ($errorMessage == '' ? 'Unknown error for feed' : json_encode($errorMessage, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_LINE_TERMINATORS)) .
+ ($errorMessage == '' ? 'Unknown error for feed' : $errorMessage) .
' [' . $this->url . ']',
$simplePie->status_code()
);