aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-09-27 00:14:35 -0700
committerfriendica <info@friendica.com>2014-09-27 00:14:35 -0700
commitfa019791fa4cd3f5ae4d3b0cf7b8cbef6483f6d6 (patch)
tree5099d4b8f2a30abb58b9f4321da90f7456f16cb6
parent1e7fbac6c1a26e6ae5be18ce3e5332f222bc2977 (diff)
downloadvolse-hubzilla-fa019791fa4cd3f5ae4d3b0cf7b8cbef6483f6d6.tar.gz
volse-hubzilla-fa019791fa4cd3f5ae4d3b0cf7b8cbef6483f6d6.tar.bz2
volse-hubzilla-fa019791fa4cd3f5ae4d3b0cf7b8cbef6483f6d6.zip
some background work for import/export of things and liked things/profiles
-rw-r--r--include/identity.php16
-rw-r--r--version.inc2
2 files changed, 17 insertions, 1 deletions
diff --git a/include/identity.php b/include/identity.php
index eaeb9f07f..d26eced2c 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)
);
diff --git a/version.inc b/version.inc
index a87b5d9bf..0947c89cf 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-09-26.810
+2014-09-27.811