From 6c1d0851d74b02bb0e7317e273788917acd8a313 Mon Sep 17 00:00:00 2001
From: Harald Eilertsen <haraldei@anduin.net>
Date: Mon, 11 Nov 2024 17:03:13 +0100
Subject: Fix invocation of DB_Update::run.

Thought this should have been part of the change set that turned the
DB_Update routine to a static function instead of a constructor to an
object that is not used.
---
 boot.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot.php b/boot.php
index 07d19e753..25fa201d5 100644
--- a/boot.php
+++ b/boot.php
@@ -1538,7 +1538,7 @@ function check_config() {
 
 	App::set_baseurl(z_root());
 
-	new DB_Upgrade(DB_UPDATE_VERSION);
+	DB_Upgrade::run(DB_UPDATE_VERSION);
 
 	plugins_sync();
 
-- 
cgit v1.2.3


From ce9d67f7b17a3b8c6dde40bce83e4329d1e7cdc2 Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Mon, 11 Nov 2024 20:00:25 +0000
Subject: fix click area in dropdown add/remove reaction

(cherry picked from commit 8268ed1ba7a995fd4559d277999ad5a482571eec)

Co-authored-by: Mario <mario@mariovavti.com>
---
 view/tpl/conv_item.tpl | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index 96e30f42d..c646387d7 100644
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -127,7 +127,7 @@
 												{{foreach $response.list as $liker}}
 												{{$liker}}
 												{{/foreach}}
-												</ul>
+											</ul>
 										</div>
 										<div class="modal-footer clear">
 											<button type="button" class="btn btn-outline-secondary" data-bs-dismiss="modal">{{$item.modal_dismiss}}</button>
@@ -138,9 +138,7 @@
 							{{else}}
 							<div class="dropdown-menu">
 								{{if $item.reactions_allowed && !($verb === 'announce' && $item.my_responses.$verb)}} {{** undo announce is not yet supported **}}
-								<div class="dropdown-item">
-									<a href="#" class="text-reset" onclick="{{$response.button.onclick}}({{$item.id}},'{{$verb}}'); return false;">{{if $item.my_responses.$verb}}- {{$item.reaction_str.1}}{{else}}+ {{$item.reaction_str.0}}{{/if}}</a>
-								</div>
+								<a href="#" class="text-reset dropdown-item" onclick="{{$response.button.onclick}}({{$item.id}},'{{$verb}}'); return false;">{{if $item.my_responses.$verb}}- {{$item.reaction_str.1}}{{else}}+ {{$item.reaction_str.0}}{{/if}}</a>
 								<div class="dropdown-divider"></div>
 								{{/if}}
 								{{foreach $response.list as $liker}}{{$liker}}{{/foreach}}
-- 
cgit v1.2.3