aboutsummaryrefslogtreecommitdiffstats
path: root/include/identity.php
diff options
context:
space:
mode:
authorhabeascodice <habeascodice@federated.social>2014-09-28 19:31:19 -0700
committerhabeascodice <habeascodice@federated.social>2014-09-28 19:31:19 -0700
commit73ebdff0837a713d8849b713d0cc2fb4701a2c5f (patch)
tree7656a07d3eb8d87d12b72cc86559bba157e60343 /include/identity.php
parentc0b59ae36a5ef31b9071edb991f63d4800e21a9d (diff)
parente18dfbe3ce0a8d89a5320e4f239801d0b84dd83e (diff)
downloadvolse-hubzilla-73ebdff0837a713d8849b713d0cc2fb4701a2c5f.tar.gz
volse-hubzilla-73ebdff0837a713d8849b713d0cc2fb4701a2c5f.tar.bz2
volse-hubzilla-73ebdff0837a713d8849b713d0cc2fb4701a2c5f.zip
Merge remote branch 'upstream/master'
Diffstat (limited to 'include/identity.php')
-rw-r--r--include/identity.php16
1 files changed, 16 insertions, 0 deletions
diff --git a/include/identity.php b/include/identity.php
index b99bbe9c9..bfdd02682 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -518,10 +518,26 @@ function identity_basic_export($channel_id, $items = false) {
$ret['photo'] = array('type' => $r[0]['type'], 'data' => base64url_encode($r[0]['data']));
}
+ $r = q("select * from obj where obj_channel = %d",
+ intval($channel_id)
+ );
+
+ if($r)
+ $ret['obj'] = $r;
+
+
if(! $items)
return $ret;
+ $r = q("select likes.*, item.mid from likes left join item on likes.iid = item.id where likes.channel_id = %d",
+ intval($channel_id)
+ );
+
+ if($r)
+ $ret['likes'] = $r;
+
+
$r = q("select item_id.*, item.mid from item_id left join item on item_id.iid = item.id where item_id.uid = %d",
intval($channel_id)
);