From b5cb3bc783086faa70e639fa71e633c10d87b17e Mon Sep 17 00:00:00 2001 From: Philipp Holzer Date: Sun, 18 Aug 2019 15:01:03 +0200 Subject: [PATCH 1/2] Fixing https://github.com/friendica/friendica/issues/7299#issuecomment-521745931 --- src/Module/Admin/Item/Source.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Module/Admin/Item/Source.php b/src/Module/Admin/Item/Source.php index 1e85b7dc7..35261e5d0 100644 --- a/src/Module/Admin/Item/Source.php +++ b/src/Module/Admin/Item/Source.php @@ -24,7 +24,7 @@ class Source extends BaseAdminModule $guid = $a->argv[1]; } - $guid = defaults($_REQUEST['guid'], $guid); + $guid = $_REQUEST['guid'] ?? $guid; $source = ''; $item_uri = ''; From bff427174b4f81fdefa00c794aa13d7d5f3eacf3 Mon Sep 17 00:00:00 2001 From: Philipp Holzer Date: Sun, 18 Aug 2019 15:14:03 +0200 Subject: [PATCH 2/2] Fix parameters for Source --- src/Module/Admin/Item/Source.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Module/Admin/Item/Source.php b/src/Module/Admin/Item/Source.php index 35261e5d0..6da9eec6d 100644 --- a/src/Module/Admin/Item/Source.php +++ b/src/Module/Admin/Item/Source.php @@ -20,8 +20,9 @@ class Source extends BaseAdminModule $a = self::getApp(); $guid = null; - if (!empty($a->argv[1])) { - $guid = $a->argv[1]; + // @TODO: Replace with parameter from router + if (!empty($a->argv[3])) { + $guid = $a->argv[3]; } $guid = $_REQUEST['guid'] ?? $guid;