aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarijus <mario@mariovavti.com>2015-01-23 15:03:19 +0100
committermarijus <mario@mariovavti.com>2015-01-23 15:03:19 +0100
commitb4f1cc5044c74432773a4796235a1907e1fcc470 (patch)
treeed03508738f89d92ca5bd2409b4a02624b5845e5
parent884d542d4b9b4b1c3b141933e2bb464ad98abbb7 (diff)
downloadvolse-hubzilla-b4f1cc5044c74432773a4796235a1907e1fcc470.tar.gz
volse-hubzilla-b4f1cc5044c74432773a4796235a1907e1fcc470.tar.bz2
volse-hubzilla-b4f1cc5044c74432773a4796235a1907e1fcc470.zip
we get the object info before it is deleted now
-rw-r--r--include/attach.php24
1 files changed, 12 insertions, 12 deletions
diff --git a/include/attach.php b/include/attach.php
index a201fd3d4..720c8da86 100644
--- a/include/attach.php
+++ b/include/attach.php
@@ -1096,31 +1096,31 @@ function get_file_activity_object($channel_id, $hash, $cloudpath) {
dbesc($hash)
);
- $url = (($cloudpath && $x[0]['filename']) ? rawurlencode($cloudpath . $x[0]['filename']) : 'unavailable');
+ $url = rawurlencode($cloudpath . $x[0]['filename']);
$links = array();
$links[] = array(
- 'rel' => 'alternate',
+ 'rel' => 'alternate',
'type' => 'text/html',
'href' => $url
);
$object = array(
'type' => ACTIVITY_OBJ_FILE,
- 'title' => (($x[0]['filename']) ? $x[0]['filename'] : 'unavailable'),
+ 'title' => $x[0]['filename']),
'id' => $url,
'link' => $links,
'hash' => $hash,
- 'creator' => (($x[0]['creator']) ? $x[0]['creator'] : ''),
- 'filename' => (($x[0]['filename']) ? $x[0]['filename'] : ''),
- 'filetype' => (($x[0]['filetype']) ? $x[0]['filetype'] : ''),
- 'filesize' => (($x[0]['filesize']) ? $x[0]['filesize'] : ''),
- 'revision' => (($x[0]['revision']) ? $x[0]['revision'] : ''),
- 'folder' => (($x[0]['folder']) ? $x[0]['folder'] : ''),
- 'flags' => (($x[0]['flags']) ? $x[0]['flags'] : ''),
- 'created' => (($x[0]['created']) ? $x[0]['created'] : ''),
- 'edited' => (($x[0]['edited']) ? $x[0]['edited'] : '')
+ 'creator' => $x[0]['creator'],
+ 'filename' => $x[0]['filename'],
+ 'filetype' => $x[0]['filetype'],
+ 'filesize' => $x[0]['filesize'],
+ 'revision' => $x[0]['revision'],
+ 'folder' => $x[0]['folder'],
+ 'flags' => $x[0]['flags'],
+ 'created' => $x[0]['created'],
+ 'edited' => $x[0]['edited']
);
return $object;