From 835f295ece1c12af50a6485a6e8339ab1fbc1089 Mon Sep 17 00:00:00 2001
From: Benjamin Brahmer <info@b-brahmer.de>
Date: Fri, 22 Apr 2022 10:14:38 +0200
Subject: Release 18.0.1

No major changes since the beta versions.

Signed-off-by: Benjamin Brahmer <info@b-brahmer.de>
---
 .github/workflows/api-php-static-code-check.yml | 2 +-
 CHANGELOG.md                                    | 4 ++++
 appinfo/info.xml                                | 2 +-
 lib/Service/ImportService.php                   | 1 +
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/api-php-static-code-check.yml b/.github/workflows/api-php-static-code-check.yml
index 320c8792c..a8c16ca7b 100644
--- a/.github/workflows/api-php-static-code-check.yml
+++ b/.github/workflows/api-php-static-code-check.yml
@@ -15,7 +15,7 @@ jobs:
             nextcloud: pre-release
             database: sqlite
             experimental: true
-    name: "phpstan: Nextcloud ${{ matrix.nextcloud }} with ${{ php-versions }}"
+    name: "phpstan: Nextcloud ${{ matrix.nextcloud }} with ${{ matrix.php-versions }}"
     steps:
       - name: Checkout
         uses: actions/checkout@v3
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1106da690..8428e9415 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,10 @@ The format is mostly based on [Keep a Changelog](https://keepachangelog.com/en/1
 ### Fixed
 
 # Releases
+
+## [18.0.1] - 2022-04-22
+No major changes since the beta versions.
+
 ## [18.0.1-beta3] - 2022-04-18
 ### Fixed
 - Fix import of items when feed does not exist (#1742)
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 82d48d814..2c169677e 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -21,7 +21,7 @@ Create a [feature request](https://github.com/nextcloud/news/discussions/new)
 
 Report a [feed issue](https://github.com/nextcloud/news/discussions/new)
     ]]></description>
-    <version>18.0.1-beta3</version>
+    <version>18.0.1</version>
     <licence>agpl</licence>
     <author>Benjamin Brahmer</author>
     <author>Sean Molenaar</author>
diff --git a/lib/Service/ImportService.php b/lib/Service/ImportService.php
index 68782dbd4..89ca9c6e8 100644
--- a/lib/Service/ImportService.php
+++ b/lib/Service/ImportService.php
@@ -83,6 +83,7 @@ class ImportService
         }
 
         $createdFeed = false;
+        $feedLink = "";
 
         // loop over all items and get the corresponding feed
         // if the feed does not exist, create a separate feed for them
-- 
cgit v1.2.3