harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev

Browse Source
This commit is contained in:
Mario Vavti 2016-09-20 15:21:21 +02:00
commit fde46ca78c
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/items.php
View File

@ -2291,6 +2291,11 @@ function store_diaspora_comment_sig($datarray, $channel, $parent_item, $post_id,
function send_status_notifications($post_id,$item) { function send_status_notifications($post_id,$item) {
// only send notifications for comments
if($item['mid'] == $item['parent_mid'])
return;
$notify = false; $notify = false;
$unfollowed = false; $unfollowed = false;
@ -2306,6 +2311,7 @@ function send_status_notifications($post_id,$item) {
if($item['author_xchan'] === $r[0]['channel_hash']) if($item['author_xchan'] === $r[0]['channel_hash'])
return; return;
// I'm the owner - notify me // I'm the owner - notify me
if($item['owner_hash'] === $r[0]['channel_hash']) if($item['owner_hash'] === $r[0]['channel_hash'])

2
include/widgets.php
View File

@ -602,7 +602,7 @@ function widget_settings_menu($arr) {
); );
if(get_features()) { if(get_account_techlevel() > 0 && get_features()) {
$tabs[] = array( $tabs[] = array(
'label' => t('Additional features'), 'label' => t('Additional features'),
'url' => z_root().'/settings/features', 'url' => z_root().'/settings/features',