aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2022-09-28 10:35:36 +0000
committerMario <mario@mariovavti.com>2022-09-28 10:35:36 +0000
commit879cdedec34f8372b0d8f8de5eff1e7329d12c5e (patch)
tree47f756bcfb3b8faa3a46b5f3cf0ac569884b0010
parentc49d1547c423ec1d62acd7440c268b508f5d58a8 (diff)
parent05bd2a1f9e1f2fc6f0c501201dd73467443799ce (diff)
downloadvolse-hubzilla-879cdedec34f8372b0d8f8de5eff1e7329d12c5e.tar.gz
volse-hubzilla-879cdedec34f8372b0d8f8de5eff1e7329d12c5e.tar.bz2
volse-hubzilla-879cdedec34f8372b0d8f8de5eff1e7329d12c5e.zip
Merge branch 'dev' into 7.8RC
-rw-r--r--Zotlabs/Lib/Libzot.php2
-rw-r--r--view/tpl/notifications_widget.tpl2
2 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Lib/Libzot.php b/Zotlabs/Lib/Libzot.php
index 607eadb07..3d14248de 100644
--- a/Zotlabs/Lib/Libzot.php
+++ b/Zotlabs/Lib/Libzot.php
@@ -1261,7 +1261,7 @@ class Libzot {
if(filter_var($env['sender'], FILTER_VALIDATE_URL)) {
// in individual delivery, change owner if needed
- $s = q("select hubloc_hash, hubloc_url from hubloc where hubloc_id_url = '%s' and hubloc_network = 'zot6' limit 1",
+ $s = q("select hubloc_hash, hubloc_url from hubloc where hubloc_id_url = '%s' and hubloc_network = 'zot6' order by hubloc_id desc limit 1",
dbesc($env['sender'])
);
diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl
index 0cba341ab..82b3665c3 100644
--- a/view/tpl/notifications_widget.tpl
+++ b/view/tpl/notifications_widget.tpl
@@ -542,7 +542,7 @@
</div>
<div id="notifications" class="border border-top-0 rounded navbar-nav collapse">
{{foreach $notifications as $notification}}
- <div class="{{if $notification@first}}rounded-top {{/if}}rounded-bottom border border-start-0 border-end-0 border-bottom-0 list-group list-group-flush collapse {{$notification.type}}-button">
+ <div class="rounded-top rounded-bottom border border-start-0 border-end-0 border-bottom-0 list-group list-group-flush collapse {{$notification.type}}-button">
<a id="notification-link-{{$notification.type}}" class="collapsed list-group-item fakelink notification-link" href="#" title="{{$notification.title}}" data-bs-target="#nav-{{$notification.type}}-sub" data-bs-toggle="collapse" data-sse_type="{{$notification.type}}">
<i class="fa fa-fw fa-{{$notification.icon}}"></i> {{$notification.label}}
<span class="float-end badge bg-{{$notification.severity}} {{$notification.type}}-update"></span>