From 91d63213ae79f6b75ccc8aa10b427ea36ba3c703 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Tue, 11 Jul 2023 09:00:41 -0400
Subject: [PATCH 1/2] Reintroduce is_string modifier in addons/connector
 templates

- Address https://github.com/friendica/friendica/issues/13157#issuecomment-1606003698
---
 view/templates/settings/addons/connector.tpl            | 2 +-
 view/theme/frio/templates/settings/addons/connector.tpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/view/templates/settings/addons/connector.tpl b/view/templates/settings/addons/connector.tpl
index adf615f9e..c06c78195 100644
--- a/view/templates/settings/addons/connector.tpl
+++ b/view/templates/settings/addons/connector.tpl
@@ -9,7 +9,7 @@
 	<div class="clear"></div>
 {{if $submit}}
 	<div class="settings-submit-wrapper panel-footer">
-    {{if $submit}}
+    {{if $submit|is_string}}
 		<button type="submit" name="{{$connector}}-submit" class="btn btn-primary settings-submit" value="{{$submit}}">{{$submit}}</button>
     {{else}}
         {{$count = 1}}
diff --git a/view/theme/frio/templates/settings/addons/connector.tpl b/view/theme/frio/templates/settings/addons/connector.tpl
index 23e796fc5..aee0e2845 100644
--- a/view/theme/frio/templates/settings/addons/connector.tpl
+++ b/view/theme/frio/templates/settings/addons/connector.tpl
@@ -11,7 +11,7 @@
 		</div>
 		<div class="panel-footer">
 {{if $submit}}
-    {{if $submit}}
+    {{if $submit|is_string}}
 			<button type="submit" name="{{$connector}}-submit" class="btn btn-primary settings-submit" value="{{$submit}}">{{$submit}}</button>
     {{else}}
         {{$count = 1}}

From 248148af991380968596e97fc1c22176fe70ef65 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Tue, 11 Jul 2023 09:02:53 -0400
Subject: [PATCH 2/2] Return early if no items are provided in
 Content\Conversation->getThreadList

- Address https://github.com/friendica/friendica/issues/13157#issuecomment-1628437859
---
 src/Content/Conversation.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Content/Conversation.php b/src/Content/Conversation.php
index b645ecf4b..6cad2b980 100644
--- a/src/Content/Conversation.php
+++ b/src/Content/Conversation.php
@@ -589,6 +589,10 @@ class Conversation
 	 */
 	public function getThreadList(array $items, string $mode, bool $preview, bool $pagedrop, string $formSecurityToken): array
 	{
+		if (!$items) {
+			return [];
+		}
+
 		if (in_array($mode, [self::MODE_FILED, self::MODE_SEARCH, self::MODE_CONTACT_POSTS])) {
 			$threads = $this->getContextLessThreadList($items, $mode, $preview, $pagedrop, $formSecurityToken);
 		} else {