diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-06-30 20:18:48 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-06-30 20:18:48 -0700 |
| commit | 86b12ea75037e2e80d4d7f678a1036735f79bcb4 (patch) | |
| tree | 8215d258347ec8c9e86aea6cc15830578ad58bef /include/identity.php | |
| parent | 97e8275dc2a63e465adb789be9f94597e5f4d400 (diff) | |
| download | volse-hubzilla-86b12ea75037e2e80d4d7f678a1036735f79bcb4.tar.gz volse-hubzilla-86b12ea75037e2e80d4d7f678a1036735f79bcb4.tar.bz2 volse-hubzilla-86b12ea75037e2e80d4d7f678a1036735f79bcb4.zip | |
lots of work on clone/import from redmatrix to hubzilla (won't go back the other way)
Diffstat (limited to 'include/identity.php')
| -rw-r--r-- | include/identity.php | 5 |
1 files changed, 2 insertions, 3 deletions
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", |