diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-05-05 05:35:00 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-05-05 05:35:00 -0400 |
| commit | 6ce939491bf932c20c9777a8518da5875e02a6b1 (patch) | |
| tree | e49b75c9017015677e6d550d75e4ce62ffaddc75 /include/identity.php | |
| parent | 8cb06e7af8c3a14a6513d2aee2beba091f3ecfb5 (diff) | |
| parent | 8ffdc4859baa9f2ae9567a4c443dfbb227919167 (diff) | |
| download | volse-hubzilla-6ce939491bf932c20c9777a8518da5875e02a6b1.tar.gz volse-hubzilla-6ce939491bf932c20c9777a8518da5875e02a6b1.tar.bz2 volse-hubzilla-6ce939491bf932c20c9777a8518da5875e02a6b1.zip | |
Merge remote-tracking branch 'upstream/dev' into plugin-repo
Diffstat (limited to 'include/identity.php')
| -rw-r--r-- | include/identity.php | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/include/identity.php b/include/identity.php index c60c846c0..53bed7c0f 100644 --- a/include/identity.php +++ b/include/identity.php @@ -580,11 +580,18 @@ function identity_basic_export($channel_id, $items = false) { if($r) $ret['obj'] = $r; - $r = q("select * from app where app_channel = %d", + $r = q("select * from app where app_channel = %d and app_system = 0", intval($channel_id) ); - if($r) + if($r) { + for($x = 0; $x < count($r); $x ++) { + $r[$x]['term'] = q("select * from term where otype = %d and oid = %d", + intval(TERM_OBJ_APP), + intval($r[$x]['id']) + ); + } $ret['app'] = $r; + } $r = q("select * from chatroom where cr_uid = %d", intval($channel_id) |