Merge pull request #805 from zotlabs/mailexport

minor export issue with mail

2 files changed, 8 insertions, 6 deletions

diff --git a/include/channel.php b/include/channel.php
index 31dca1ae5..2284b3004 100644
--- a/include/channel.php
+++ b/include/channel.php
@@ -736,14 +736,14 @@ function identity_basic_export($channel_id, $sections = null) {
 			$ret['conv'] = $r;
 		}
 
-		$r = q("select * from mail where mail.uid = %d",
+		$r = q("select * from mail where channel_id = %d",
 			intval($channel_id)
 		);
 		if($r) {
 			$m = array();
 			foreach($r as $rr) {
 				xchan_mail_query($rr);
-				$m[] = mail_encode($rr,true);
+				$m[] = encode_mail($rr,true);
 			}
 			$ret['mail'] = $m;
 		}
diff --git a/include/message.php b/include/message.php
index 4e8e44adc..609ceb354 100644
--- a/include/message.php
+++ b/include/message.php
@@ -441,10 +441,12 @@ function private_messages_drop($channel_id, $messageitem_id, $drop_conversation
 			intval($channel_id)
 		);
 		if($z) {
-			q("delete from conv where guid = '%s' and uid = %d",
-				dbesc($x[0]['conv_guid']),
-				intval($channel_id)
-			);		
+			if($x[0]['conv_guid']) {
+				q("delete from conv where guid = '%s' and uid = %d",
+					dbesc($x[0]['conv_guid']),
+					intval($channel_id)
+				);
+			}		
 			$m['mail'] = array();
 			foreach($z as $zz) {
 				xchan_mail_query($zz);