From c5578d79643bbdde8f49baae2fa6890fc9bf9a53 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Tue, 1 Sep 2015 21:08:02 -0700 Subject: match the redmatrix output format for objects (which is the hubzilla table format) --- include/identity.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/include/identity.php b/include/identity.php index 6cfa38f19..1bea5d790 100644 --- a/include/identity.php +++ b/include/identity.php @@ -556,13 +556,9 @@ function identity_basic_export($channel_id, $items = false) { $ret['term'] = $r; - // make the obj output match the hubzilla file format + // add psuedo-column obj_baseurl to aid in relocations - $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), + $r = q("select obj.*, '%s' as obj_baseurl from obj where obj_channel = %d", dbesc(z_root()), intval($channel_id) ); -- cgit v1.2.3