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

issue #843

Browse Source
This commit is contained in:
friendica 2015-02-11 20:38:06 -08:00
parent 78b8754856
commit 2b2fa5a973
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/attach.php
View File

@ -65,10 +65,10 @@ function z_mime_content_type($filename) {
'mov' => 'video/quicktime', 'mov' => 'video/quicktime',
'ogg' => 'application/ogg', 'ogg' => 'application/ogg',
'opus' => 'audio/ogg', 'opus' => 'audio/ogg',
'webm' => 'audio/webm',
'webm' => 'video/webm', 'webm' => 'video/webm',
'mp4' => 'audio/mp4', // 'webm' => 'audio/webm',
'mp4' => 'video/mp4', 'mp4' => 'video/mp4',
// 'mp4' => 'audio/mp4',
// adobe // adobe
'pdf' => 'application/pdf', 'pdf' => 'application/pdf',

3
include/items.php
View File

@ -2720,6 +2720,9 @@ function tag_deliver($uid,$item_id) {
if($obj['id'] !== $u[0]['channel_hash']) if($obj['id'] !== $u[0]['channel_hash'])
$poke_notify = false; $poke_notify = false;
} }
if($item['item_restrict'] & ITEM_DELETED)
$poke_notify = false;
$verb = urldecode(substr($item['verb'],strpos($item['verb'],'#')+1)); $verb = urldecode(substr($item['verb'],strpos($item['verb'],'#')+1));
if($poke_notify) { if($poke_notify) {