diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-09-01 21:04:57 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-09-01 21:04:57 -0700 |
| commit | 95cf1aafa0084663e396ccc3d077cfd52325b3a8 (patch) | |
| tree | e8ed334681dd0b4c69fa4f401bcb7929a5175c9c /include/identity.php | |
| parent | f2397c942c9c5489b4830996e560500410789161 (diff) | |
| parent | f72a3113f5a42808e41b8eef19cc7ea6c6b199b8 (diff) | |
| download | volse-hubzilla-95cf1aafa0084663e396ccc3d077cfd52325b3a8.tar.gz volse-hubzilla-95cf1aafa0084663e396ccc3d077cfd52325b3a8.tar.bz2 volse-hubzilla-95cf1aafa0084663e396ccc3d077cfd52325b3a8.zip | |
Merge https://github.com/redmatrix/redmatrix into pending_merge
Diffstat (limited to 'include/identity.php')
| -rw-r--r-- | include/identity.php | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/include/identity.php b/include/identity.php index 9ff5af4fe..6cfa38f19 100644 --- a/include/identity.php +++ b/include/identity.php @@ -555,7 +555,15 @@ function identity_basic_export($channel_id, $items = false) { if($r) $ret['term'] = $r; - $r = q("select * from obj where obj_channel = %d", + + // make the obj output match the hubzilla file format + + $datestamp = datetime_convert(); + + $r = q("select obj.*, term.term as obj_term, term.url as obj_url, term.imgurl as obj_imgurl, '%s' as obj_created, '%s' as obj_edited, '%s' as obj_baseurl from obj left join term on obj_obj = term.term_hash where obj_channel = %d", + dbesc($datestamp), + dbesc($datestamp), + dbesc(z_root()), intval($channel_id) ); |