From 0011b8fd4809f4e8eb3f21dc036714493e45c5b4 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Mon, 19 Sep 2016 14:42:56 -0700 Subject: probable fix for #509 - errant comment notifications provided on delayed (duplicate delivery) top level posts which are probably coming from clones --- include/items.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/items.php b/include/items.php index 9079621a3..f2be2a114 100755 --- a/include/items.php +++ b/include/items.php @@ -2291,6 +2291,11 @@ function store_diaspora_comment_sig($datarray, $channel, $parent_item, $post_id, function send_status_notifications($post_id,$item) { + // only send notifications for comments + + if($item['mid'] == $item['parent_mid']) + return; + $notify = false; $unfollowed = false; @@ -2306,6 +2311,7 @@ function send_status_notifications($post_id,$item) { if($item['author_xchan'] === $r[0]['channel_hash']) return; + // I'm the owner - notify me if($item['owner_hash'] === $r[0]['channel_hash']) -- cgit v1.2.3 From 73bd65ead58edcb42938165144ff237c27437bbc Mon Sep 17 00:00:00 2001 From: redmatrix Date: Tue, 20 Sep 2016 06:05:20 -0700 Subject: don't offer a settings/features link for techlevel 0 (basic or pro:0) even if there are level 0 features/categories. The definition of level 0 is "don't confuse me with options". --- include/widgets.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/widgets.php b/include/widgets.php index 0b3a0d108..9cd15dd59 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -602,7 +602,7 @@ function widget_settings_menu($arr) { ); - if(get_features()) { + if(get_account_techlevel() > 0 && get_features()) { $tabs[] = array( 'label' => t('Additional features'), 'url' => z_root().'/settings/features', -- cgit v1.2.3