aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorredmatrix <mike@macgirvin.com>2016-09-20 15:53:30 -0700
committerredmatrix <mike@macgirvin.com>2016-09-20 15:53:30 -0700
commit4511f8855b195d7c675ffe9f128b0db1be120b1b (patch)
tree2b2d7e90fc04cad2cee9177ae6a1b40f4f71c6fe /Zotlabs
parent007836f514b5e268078bf20bd95fe260fb76fb4f (diff)
downloadvolse-hubzilla-4511f8855b195d7c675ffe9f128b0db1be120b1b.tar.gz
volse-hubzilla-4511f8855b195d7c675ffe9f128b0db1be120b1b.tar.bz2
volse-hubzilla-4511f8855b195d7c675ffe9f128b0db1be120b1b.zip
issue #516
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Module/Item.php123
1 files changed, 58 insertions, 65 deletions
diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php
index 97b1e883d..ac2067356 100644
--- a/Zotlabs/Module/Item.php
+++ b/Zotlabs/Module/Item.php
@@ -755,71 +755,64 @@ class Item extends \Zotlabs\Web\Controller {
$plink = z_root() . '/channel/' . $channel['channel_address'] . '/?f=&mid=' . $mid;
}
-
-
-
-
- $datarray['aid'] = $channel['channel_account_id'];
- $datarray['uid'] = $profile_uid;
-
- $datarray['owner_xchan'] = (($owner_hash) ? $owner_hash : $owner_xchan['xchan_hash']);
- $datarray['author_xchan'] = $observer['xchan_hash'];
- $datarray['created'] = $created;
- $datarray['edited'] = (($orig_post) ? datetime_convert() : $created);
- $datarray['expires'] = $expires;
- $datarray['commented'] = (($orig_post) ? datetime_convert() : $created);
- $datarray['received'] = (($orig_post) ? datetime_convert() : $created);
- $datarray['changed'] = (($orig_post) ? datetime_convert() : $created);
- $datarray['mid'] = $mid;
- $datarray['parent_mid'] = $parent_mid;
- $datarray['mimetype'] = $mimetype;
- $datarray['title'] = $title;
- $datarray['body'] = $body;
- $datarray['app'] = $app;
- $datarray['location'] = $location;
- $datarray['coord'] = $coord;
- $datarray['verb'] = $verb;
- $datarray['obj_type'] = $obj_type;
- $datarray['allow_cid'] = $str_contact_allow;
- $datarray['allow_gid'] = $str_group_allow;
- $datarray['deny_cid'] = $str_contact_deny;
- $datarray['deny_gid'] = $str_group_deny;
- $datarray['item_private'] = $private;
- $datarray['item_wall'] = $item_wall;
- $datarray['attach'] = $attachments;
- $datarray['thr_parent'] = $thr_parent;
- $datarray['postopts'] = $postopts;
- $datarray['item_unseen'] = $item_unseen;
- $datarray['item_wall'] = $item_wall;
- $datarray['item_origin'] = $item_origin;
- $datarray['item_type'] = $webpage;
- $datarray['item_thread_top'] = $item_thread_top;
- $datarray['item_unseen'] = $item_unseen;
- $datarray['item_starred'] = $item_starred;
- $datarray['item_uplink'] = $item_uplink;
- $datarray['item_consensus'] = $item_consensus;
- $datarray['item_notshown'] = $item_notshown;
- $datarray['item_nsfw'] = $item_nsfw;
- $datarray['item_relay'] = $item_relay;
- $datarray['item_mentionsme'] = $item_mentionsme;
- $datarray['item_nocomment'] = $item_nocomment;
- $datarray['item_obscured'] = $item_obscured;
- $datarray['item_verified'] = $item_verified;
- $datarray['item_retained'] = $item_retained;
- $datarray['item_rss'] = $item_rss;
- $datarray['item_deleted'] = $item_deleted;
- $datarray['item_hidden'] = $item_hidden;
- $datarray['item_unpublished'] = $item_unpublished;
- $datarray['item_delayed'] = $item_delayed;
- $datarray['item_pending_remove'] = $item_pending_remove;
- $datarray['item_blocked'] = $item_blocked;
-
- $datarray['layout_mid'] = $layout_mid;
- $datarray['public_policy'] = $public_policy;
- $datarray['comment_policy'] = map_scope($comment_policy);
- $datarray['term'] = $post_tags;
- $datarray['plink'] = $plink;
- $datarray['route'] = $route;
+ $datarray['aid'] = $channel['channel_account_id'];
+ $datarray['uid'] = $profile_uid;
+ $datarray['owner_xchan'] = (($owner_hash) ? $owner_hash : $owner_xchan['xchan_hash']);
+ $datarray['author_xchan'] = $observer['xchan_hash'];
+ $datarray['created'] = $created;
+ $datarray['edited'] = (($orig_post) ? datetime_convert() : $created);
+ $datarray['expires'] = $expires;
+ $datarray['commented'] = (($orig_post) ? datetime_convert() : $created);
+ $datarray['received'] = (($orig_post) ? datetime_convert() : $created);
+ $datarray['changed'] = (($orig_post) ? datetime_convert() : $created);
+ $datarray['mid'] = $mid;
+ $datarray['parent_mid'] = $parent_mid;
+ $datarray['mimetype'] = $mimetype;
+ $datarray['title'] = $title;
+ $datarray['body'] = $body;
+ $datarray['app'] = $app;
+ $datarray['location'] = $location;
+ $datarray['coord'] = $coord;
+ $datarray['verb'] = $verb;
+ $datarray['obj_type'] = $obj_type;
+ $datarray['allow_cid'] = $str_contact_allow;
+ $datarray['allow_gid'] = $str_group_allow;
+ $datarray['deny_cid'] = $str_contact_deny;
+ $datarray['deny_gid'] = $str_group_deny;
+ $datarray['attach'] = $attachments;
+ $datarray['thr_parent'] = $thr_parent;
+ $datarray['postopts'] = $postopts;
+ $datarray['item_unseen'] = intval($item_unseen);
+ $datarray['item_wall'] = intval($item_wall);
+ $datarray['item_origin'] = intval($item_origin);
+ $datarray['item_type'] = $webpage;
+ $datarray['item_private'] = intval($private);
+ $datarray['item_thread_top'] = intval($item_thread_top);
+ $datarray['item_unseen'] = intval($item_unseen);
+ $datarray['item_starred'] = intval($item_starred);
+ $datarray['item_uplink'] = intval($item_uplink);
+ $datarray['item_consensus'] = intval($item_consensus);
+ $datarray['item_notshown'] = intval($item_notshown);
+ $datarray['item_nsfw'] = intval($item_nsfw);
+ $datarray['item_relay'] = intval($item_relay);
+ $datarray['item_mentionsme'] = intval($item_mentionsme);
+ $datarray['item_nocomment'] = intval($item_nocomment);
+ $datarray['item_obscured'] = intval($item_obscured);
+ $datarray['item_verified'] = intval($item_verified);
+ $datarray['item_retained'] = intval($item_retained);
+ $datarray['item_rss'] = intval($item_rss);
+ $datarray['item_deleted'] = intval($item_deleted);
+ $datarray['item_hidden'] = intval($item_hidden);
+ $datarray['item_unpublished'] = intval($item_unpublished);
+ $datarray['item_delayed'] = intval($item_delayed);
+ $datarray['item_pending_remove'] = intval($item_pending_remove);
+ $datarray['item_blocked'] = intval($item_blocked);
+ $datarray['layout_mid'] = $layout_mid;
+ $datarray['public_policy'] = $public_policy;
+ $datarray['comment_policy'] = map_scope($comment_policy);
+ $datarray['term'] = $post_tags;
+ $datarray['plink'] = $plink;
+ $datarray['route'] = $route;
if($iconfig)
$datarray['iconfig'] = $iconfig;