diff options
| author | friendica <info@friendica.com> | 2015-02-11 20:38:06 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-02-11 20:38:06 -0800 |
| commit | 2b2fa5a973a2c2b97b2689b926fe2ae6bca3685d (patch) | |
| tree | 45038f7d8bd06802f72f307b7ef0ceb07ad7ae37 | |
| parent | 78b87548564f35be5ab04adb19d5960c3ce50356 (diff) | |
| download | volse-hubzilla-2b2fa5a973a2c2b97b2689b926fe2ae6bca3685d.tar.gz volse-hubzilla-2b2fa5a973a2c2b97b2689b926fe2ae6bca3685d.tar.bz2 volse-hubzilla-2b2fa5a973a2c2b97b2689b926fe2ae6bca3685d.zip | |
issue #843
| -rw-r--r-- | include/attach.php | 4 | ||||
| -rwxr-xr-x | include/items.php | 3 |
2 files changed, 5 insertions, 2 deletions
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) { |