aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-10-27 18:37:03 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-10-27 18:37:03 -0700
commit65587be737e13e611f6e5ba67ee0301c312250b9 (patch)
treebed5aa3b3a2bce24b158538872f26fb3fd5d25ad /include
parent9c24e1ccfb11ec40587b7b5aaa42429e2070ff8a (diff)
parent0147186565da99d6d89d6c2d57f5b7034fca0d68 (diff)
downloadvolse-hubzilla-65587be737e13e611f6e5ba67ee0301c312250b9.tar.gz
volse-hubzilla-65587be737e13e611f6e5ba67ee0301c312250b9.tar.bz2
volse-hubzilla-65587be737e13e611f6e5ba67ee0301c312250b9.zip
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'include')
-rw-r--r--include/attach.php5
-rw-r--r--include/photos.php11
2 files changed, 10 insertions, 6 deletions
diff --git a/include/attach.php b/include/attach.php
index f5d2c69b6..a959a5bcb 100644
--- a/include/attach.php
+++ b/include/attach.php
@@ -64,7 +64,10 @@ function z_mime_content_type($filename) {
'wav' => 'audio/wav',
'qt' => 'video/quicktime',
'mov' => 'video/quicktime',
- 'ogg' => 'application/ogg',
+ 'ogg' => 'audio/ogg',
+ 'ogv' => 'video/ogg',
+ 'ogx' => 'application/ogg',
+ 'flac' => 'audio/flac',
'opus' => 'audio/ogg',
'webm' => 'video/webm',
// 'webm' => 'audio/webm',
diff --git a/include/photos.php b/include/photos.php
index a8619c372..d62d5aeb8 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -292,18 +292,19 @@ function photo_upload($channel, $observer, $args) {
$tag = (($r2) ? '[zmg=' . $width . 'x' . $height . ']' : '[zmg]');
}
+ $body = '[zrl=' . z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo_hash . ']'
+ . $tag . z_root() . "/photo/{$photo_hash}-{$scale}." . $ph->getExt() . '[/zmg]'
+ . '[/zrl]';
+
// Create item object
$object = array(
'type' => ACTIVITY_OBJ_PHOTO,
'title' => $title,
'id' => rawurlencode(z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo_hash),
- 'link' => $link
+ 'link' => $link,
+ 'bbcode' => $body
);
- $body = '[zrl=' . z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo_hash . ']'
- . $tag . z_root() . "/photo/{$photo_hash}-{$scale}." . $ph->getExt() . '[/zmg]'
- . '[/zrl]';
-
// Create item container
if($args['item']) {
foreach($args['item'] as $i) {