From 86b12ea75037e2e80d4d7f678a1036735f79bcb4 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Tue, 30 Jun 2015 20:18:48 -0700 Subject: lots of work on clone/import from redmatrix to hubzilla (won't go back the other way) --- include/identity.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/identity.php b/include/identity.php index 5880e912e..8ba5d64db 100644 --- a/include/identity.php +++ b/include/identity.php @@ -537,15 +537,14 @@ function identity_basic_export($channel_id, $items = false) { if($r) $ret['config'] = $r; - $r = q("select type, data from photo where scale = 4 and profile = 1 and uid = %d limit 1", + $r = q("select type, data, os_storage from photo where scale = 4 and profile = 1 and uid = %d limit 1", intval($channel_id) ); if($r) { - $ret['photo'] = array('type' => $r[0]['type'], 'data' => base64url_encode($r[0]['data'])); + $ret['photo'] = array('type' => $r[0]['type'], 'data' => (($r[0]['os_storage']) ? base64url_encode(file_get_contents($r[0]['data'])) : base64url_encode($r[0]['data']))); } - // All other term types will be included in items, if requested. $r = q("select * from term where type in (%d,%d) and uid = %d", -- cgit v1.2.3