From 2b2fa5a973a2c2b97b2689b926fe2ae6bca3685d Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 11 Feb 2015 20:38:06 -0800 Subject: issue #843 --- include/attach.php | 4 ++-- include/items.php | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/attach.php b/include/attach.php index f878a886f..5ed2cf6d2 100644 --- a/include/attach.php +++ b/include/attach.php @@ -65,10 +65,10 @@ function z_mime_content_type($filename) { 'mov' => 'video/quicktime', 'ogg' => 'application/ogg', 'opus' => 'audio/ogg', - 'webm' => 'audio/webm', 'webm' => 'video/webm', - 'mp4' => 'audio/mp4', +// 'webm' => 'audio/webm', 'mp4' => 'video/mp4', +// 'mp4' => 'audio/mp4', // adobe 'pdf' => 'application/pdf', diff --git a/include/items.php b/include/items.php index de69a0f81..deaed18e1 100755 --- a/include/items.php +++ b/include/items.php @@ -2720,6 +2720,9 @@ function tag_deliver($uid,$item_id) { if($obj['id'] !== $u[0]['channel_hash']) $poke_notify = false; } + if($item['item_restrict'] & ITEM_DELETED) + $poke_notify = false; + $verb = urldecode(substr($item['verb'],strpos($item['verb'],'#')+1)); if($poke_notify) { -- cgit v1.2.3