From 02d17be4ffe229fc6657207d31eba0543b5f1a4c Mon Sep 17 00:00:00 2001
From: Yassine Doghri <yassine@doghri.fr>
Date: Mon, 23 Aug 2021 13:49:07 +0000
Subject: [PATCH] fix(import): cast description's SimpleXMLElement to string
Podcast import crashed because of type errors
---
app/Controllers/Admin/PodcastImportController.php | 8 ++++----
package-lock.json | 5 +++++
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/app/Controllers/Admin/PodcastImportController.php b/app/Controllers/Admin/PodcastImportController.php
index ab81148683..1d35ffba69 100644
--- a/app/Controllers/Admin/PodcastImportController.php
+++ b/app/Controllers/Admin/PodcastImportController.php
@@ -308,7 +308,7 @@ class PodcastImportController extends BaseController
$slug = slugify(
$this->request->getPost('slug_field') === 'title'
? (string) $item->title
- : basename($item->link),
+ : basename((string) $item->link),
);
if (in_array($slug, $slugs, true)) {
$slugNumber = 2;
@@ -319,10 +319,10 @@ class PodcastImportController extends BaseController
}
$slugs[] = $slug;
$itemDescriptionHtml = match ($this->request->getPost('description_field')) {
- 'content' => $nsContent->encoded,
- 'summary' => $nsItunes->summary,
+ 'content' => (string) $nsContent->encoded,
+ 'summary' => (string) $nsItunes->summary,
'subtitle_summary' => $nsItunes->subtitle . '<br/>' . $nsItunes->summary,
- default => $item->description,
+ default => (string) $item->description,
};
if (
diff --git a/package-lock.json b/package-lock.json
index b55d0dca47..15873ed05e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4510,6 +4510,11 @@
"safer-buffer": "^2.0.2",
"tweetnacl": "~0.14.0"
},
+ "bin": {
+ "sshpk-conv": "bin/sshpk-conv",
+ "sshpk-sign": "bin/sshpk-sign",
+ "sshpk-verify": "bin/sshpk-verify"
+ },
"engines": {
"node": ">=0.10.0"
}
--
GitLab