diff options
| author | Mario <mario@mariovavti.com> | 2023-11-25 17:12:28 +0100 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2023-11-25 17:12:28 +0100 |
| commit | 0fd8e02a884a2b040dca62ab5d9674db5f6a070b (patch) | |
| tree | 586ee43f32f6f14368c09026f21dcd3244ea24b6 /Zotlabs/Widget | |
| parent | 82e704ec5b107823c09f1387e9091adee53a4c2d (diff) | |
| parent | 55c4bfb67009c598f25b1a8189604bfffa73dfbb (diff) | |
| download | volse-hubzilla-8.8.tar.gz volse-hubzilla-8.8.tar.bz2 volse-hubzilla-8.8.zip | |
Merge branch '8.8RC'8.8
Diffstat (limited to 'Zotlabs/Widget')
| -rw-r--r-- | Zotlabs/Widget/Activity_filter.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Widget/Item.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Widget/Notifications.php | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/Zotlabs/Widget/Activity_filter.php b/Zotlabs/Widget/Activity_filter.php index daaf5fb67..a8a00bda6 100644 --- a/Zotlabs/Widget/Activity_filter.php +++ b/Zotlabs/Widget/Activity_filter.php @@ -26,7 +26,7 @@ class Activity_filter { $starred_active = ''; $conv_active = ''; $tabs = []; - $cmd = \App::$cmd; + $cmd = 'network'; //\App::$cmd; if(x($_GET,'dm')) { $dm_active = (($_GET['dm'] == 1) ? 'active' : ''); diff --git a/Zotlabs/Widget/Item.php b/Zotlabs/Widget/Item.php index 9fd703dfe..6f943ffdf 100644 --- a/Zotlabs/Widget/Item.php +++ b/Zotlabs/Widget/Item.php @@ -34,7 +34,7 @@ class Item { if($arr['title']) { $r = q("select item.* from item left join iconfig on item.id = iconfig.iid where item.uid = %d and iconfig.cat = 'system' and iconfig.v = '%s' - and iconfig.k = 'WEBPAGE' and item_type = %d $sql_options $revision limit 1", + and iconfig.k = 'WEBPAGE' and item_type = %d $sql_extra $revision limit 1", intval($channel_id), dbesc($arr['title']), intval(ITEM_TYPE_WEBPAGE) diff --git a/Zotlabs/Widget/Notifications.php b/Zotlabs/Widget/Notifications.php index a4e632a9f..b16303be6 100644 --- a/Zotlabs/Widget/Notifications.php +++ b/Zotlabs/Widget/Notifications.php @@ -157,9 +157,11 @@ class Notifications { 'url' => 'pubstream', 'label' => t('Public stream') ], + /* 'markall' => [ 'label' => t('Mark all notifications seen') ], + */ 'filter' => [ 'posts_label' => t('Show new posts only'), 'name_label' => t('Filter by name or address') |