Merge https://github.com/redmatrix/redmatrix into pending_merge

2015-09-01 22:27:00 -07:00 · 2015-09-01 22:27:00 -07:00 · 23213a91ed
commit 23213a91ed
parent 6cc60ba477 184c544a24
1 changed files with 7 additions and 0 deletions
--- a/include/identity.php
+++ b/include/identity.php
@ -566,6 +566,13 @@ function identity_basic_export($channel_id, $items = false) {
 	if($r)
 		$ret['obj'] = $r;

+
+	$r = q("select * from app where app_channel = %d",
+		intval($channel_id)
+	);
+	if($r)
+		$ret['app'] = $r;
+
 	if(! $items)
 		return $ret;