diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-09-01 07:21:17 +0200 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-09-01 07:21:17 +0200 |
| commit | 4fe3b5c6a62987189f4d29fba78c71f7df42791c (patch) | |
| tree | 89f53893011a8d623d685067cbc52449e25926da /mod/import.php | |
| parent | 1b82fb7349a7a4048755d92e757efc5dc227b227 (diff) | |
| parent | 417da13353431ddadafe661803115cf9dd9bf9ca (diff) | |
| download | volse-hubzilla-4fe3b5c6a62987189f4d29fba78c71f7df42791c.tar.gz volse-hubzilla-4fe3b5c6a62987189f4d29fba78c71f7df42791c.tar.bz2 volse-hubzilla-4fe3b5c6a62987189f4d29fba78c71f7df42791c.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mod/import.php')
| -rw-r--r-- | mod/import.php | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/mod/import.php b/mod/import.php index bf1f0ca2e..0c5ec2a4c 100644 --- a/mod/import.php +++ b/mod/import.php @@ -447,7 +447,7 @@ function import_post(&$a) { -// FIXME - ensure we have an xchan if somebody is trying to pull a fast one + // FIXME - ensure we have an xchan if somebody is trying to pull a fast one if($completed < 8) { $friends = 0; @@ -556,6 +556,24 @@ function import_post(&$a) { ref_session_write(session_id(), serialize($_SESSION)); } + +// This needs more work - we also need the term where otype = 6 to link with this, and the terms need to be relocated. +// $objs = $data['obj']; +// if($objs) { +// foreach($objs as $obj) { +// unset($obj['obj_id']); +// $obj['channel'] = $channel['channel_id']; + +// dbesc_array($obj); +// $r = dbq("INSERT INTO obj (`" +// . implode("`, `", array_keys($obj)) +// . "`) VALUES ('" +// . implode("', '", array_values($obj)) +// . "')" ); +// } +// } + + $saved_notification_flags = notifications_off($channel['channel_id']); if($import_posts && array_key_exists('item',$data) && $data['item']) { @@ -614,7 +632,7 @@ function import_post(&$a) { -// FIXME - ensure we have a self entry if somebody is trying to pull a fast one + // FIXME - ensure we have a self entry if somebody is trying to pull a fast one // send out refresh requests // notify old server that it may no longer be primary. |