diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-09-03 18:12:02 +0200 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-09-03 18:12:02 +0200 |
| commit | adfc748bfa724ad8cc9d4ebf6f9d095fc56fb936 (patch) | |
| tree | 2d5e256b6bb001397939debad609789367745fc9 /include/identity.php | |
| parent | 2ce1e3678acd59409f1013433db99df6624c2895 (diff) | |
| parent | f3cb17ac3b007afd2dc5bf7cdad8a054b4d7fcd8 (diff) | |
| download | volse-hubzilla-adfc748bfa724ad8cc9d4ebf6f9d095fc56fb936.tar.gz volse-hubzilla-adfc748bfa724ad8cc9d4ebf6f9d095fc56fb936.tar.bz2 volse-hubzilla-adfc748bfa724ad8cc9d4ebf6f9d095fc56fb936.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/identity.php')
| -rw-r--r-- | include/identity.php | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/include/identity.php b/include/identity.php index 8d6a65cad..115baddc1 100644 --- a/include/identity.php +++ b/include/identity.php @@ -555,17 +555,27 @@ function identity_basic_export($channel_id, $items = false) { if($r) $ret['term'] = $r; - $r = q("select * from obj where obj_channel = %d", + + // add psuedo-column obj_baseurl to aid in relocations + + $r = q("select obj.*, '%s' as obj_baseurl from obj where obj_channel = %d", + dbesc(z_root()), intval($channel_id) ); 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; - $r = q("select * from likes where channel_id = %d", intval($channel_id) ); |