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

1 files changed, 25 insertions, 0 deletions

diff --git a/include/identity.php b/include/identity.php
index 47738a8fa..bb905e18f 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -631,6 +631,31 @@ function identity_basic_export($channel_id, $items = false) {
 	if($r)
 		$ret['likes'] = $r;
 
+
+	$r = q("select * from conv where uid = %d",
+		intval($channel_id)
+	);
+	if($r)
+		$ret['conv'] = $r;
+
+
+	$r = q("select mail.*, conv.guid as conv_guid from mail left join conv on mail.convid = conv.id where mail.uid = %d",
+		intval($channel_id)
+	);
+	if($r) {
+		$m = array();
+		foreach($r as $rr) {
+			
+
+
+		
+		}
+		$ret['mail'] = $m;
+	}
+
+
+
+
 	$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)
 	);