Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
This commit is contained in:
		| @@ -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']) | ||||
|   | ||||
| @@ -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', | ||||
|   | ||||
		Reference in New Issue
	
	Block a user