diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-12-03 09:46:49 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2018-12-03 10:49:08 +0100 |
| commit | c50e3a702aa93cc9fde1380e8addaeb62e4139b2 (patch) | |
| tree | 1fbd681f7c9210a1fa36a0850dc8bc7a4e65b0b3 | |
| parent | 2173ef5fb6025543398d2ee7b4d11c5c0971e92b (diff) | |
| download | volse-hubzilla-c50e3a702aa93cc9fde1380e8addaeb62e4139b2.tar.gz volse-hubzilla-c50e3a702aa93cc9fde1380e8addaeb62e4139b2.tar.bz2 volse-hubzilla-c50e3a702aa93cc9fde1380e8addaeb62e4139b2.zip | |
more notifications fixes
(cherry picked from commit 9ef6c57ca59aa318a3564f6b48c6442870650d3e)
| -rw-r--r-- | Zotlabs/Widget/Notifications.php | 8 | ||||
| -rw-r--r-- | include/text.php | 2 | ||||
| -rw-r--r-- | view/tpl/notifications_widget.tpl | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/Zotlabs/Widget/Notifications.php b/Zotlabs/Widget/Notifications.php index 0f9f609e4..37d9139ec 100644 --- a/Zotlabs/Widget/Notifications.php +++ b/Zotlabs/Widget/Notifications.php @@ -24,7 +24,7 @@ class Notifications { ], 'filter' => [ 'posts_label' => t('Show new posts only'), - 'name_label' => t('Filter by name') + 'name_label' => t('Filter by name or address') ] ]; @@ -43,7 +43,7 @@ class Notifications { ], 'filter' => [ 'posts_label' => t('Show new posts only'), - 'name_label' => t('Filter by name') + 'name_label' => t('Filter by name or address') ] ]; @@ -119,7 +119,7 @@ class Notifications { 'label' => t('Forums'), 'title' => t('Forums'), 'filter' => [ - 'name_label' => t('Filter by name') + 'name_label' => t('Filter by name or address') ] ]; } @@ -150,7 +150,7 @@ class Notifications { ], 'filter' => [ 'posts_label' => t('Show new posts only'), - 'name_label' => t('Filter by name') + 'name_label' => t('Filter by name or address') ] ]; } diff --git a/include/text.php b/include/text.php index cce8a6ed5..bd0d8048d 100644 --- a/include/text.php +++ b/include/text.php @@ -3421,7 +3421,7 @@ function get_forum_channels($uid) { $sql_extra = (($xf) ? " and ( xchan_hash in (" . $xf . ") or xchan_pubforum = 1 ) " : " and xchan_pubforum = 1 "); - $r = q("select abook_id, xchan_hash, xchan_name, xchan_url, xchan_photo_s from abook left join xchan on abook_xchan = xchan_hash where xchan_deleted = 0 and abook_channel = %d and abook_pending = 0 and abook_ignored = 0 and abook_blocked = 0 and abook_archived = 0 $sql_extra order by xchan_name", + $r = q("select abook_id, xchan_hash, xchan_name, xchan_url, xchan_addr, xchan_photo_s from abook left join xchan on abook_xchan = xchan_hash where xchan_deleted = 0 and abook_channel = %d and abook_pending = 0 and abook_ignored = 0 and abook_blocked = 0 and abook_archived = 0 $sql_extra order by xchan_name", intval($uid) ); diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl index c88ab827c..98047f1d9 100644 --- a/view/tpl/notifications_widget.tpl +++ b/view/tpl/notifications_widget.tpl @@ -142,7 +142,7 @@ </a> </div> <div id="nav-notifications-forums-template" rel="template"> - <a class="list-group-item clearfix notification notification-forum" href="{0}" title="{4}" data-b64mid="{7}" data-notify_id="{8}" data-thread_top="{9}" data-contact_name="{2}" data-contact_addr="{3}"> + <a class="list-group-item clearfix notification notification-forum" href="{0}" title="{4} - {3}" data-b64mid="{7}" data-notify_id="{8}" data-thread_top="{9}" data-contact_name="{2}" data-contact_addr="{3}"> <span class="float-right badge badge-{{$notification.severity}}">{10}</span> <img class="menu-img-1" data-src="{1}"> <span class="">{2}</span> |