aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-09-20 15:21:21 +0200
committerMario Vavti <mario@mariovavti.com>2016-09-20 15:21:21 +0200
commitfde46ca78c2d082c4f456925532f6da63361d9b0 (patch)
tree4e47eb0a9b5957438d48deccf248902b80055713
parentab59479a0c095c0cebb3b5cb9304850ad54e86d3 (diff)
parent299c46f118d39ea954ed52fd1b9cab617966db84 (diff)
downloadvolse-hubzilla-fde46ca78c2d082c4f456925532f6da63361d9b0.tar.gz
volse-hubzilla-fde46ca78c2d082c4f456925532f6da63361d9b0.tar.bz2
volse-hubzilla-fde46ca78c2d082c4f456925532f6da63361d9b0.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
-rwxr-xr-xinclude/items.php6
-rw-r--r--include/widgets.php2
2 files changed, 7 insertions, 1 deletions
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'])
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',