diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-06-15 19:15:47 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-06-15 19:15:47 -0400 |
| commit | f2dda646ecf1d11bf88c085d1174d3c147f799b1 (patch) | |
| tree | c86f59fcca3a84413d77c325be433c4c5ea862e2 /include/import.php | |
| parent | 98484f0def82493ff9d45405dadefd141a1b32ba (diff) | |
| parent | 47fc0c79588d55a207dc39ae8062ec55382e2564 (diff) | |
| download | volse-hubzilla-f2dda646ecf1d11bf88c085d1174d3c147f799b1.tar.gz volse-hubzilla-f2dda646ecf1d11bf88c085d1174d3c147f799b1.tar.bz2 volse-hubzilla-f2dda646ecf1d11bf88c085d1174d3c147f799b1.zip | |
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'include/import.php')
| -rw-r--r-- | include/import.php | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/include/import.php b/include/import.php index be456bfa9..0f52f3ff8 100644 --- a/include/import.php +++ b/include/import.php @@ -624,19 +624,14 @@ function import_item_ids($channel,$itemids) { ); if(! $r) continue; - $z = q("select * from item_id where service = '%s' and sid = '%s' and iid = %d and uid = %d limit 1", + $z = q("select * from iconfig where iconfig.cat = 'system' and iconfig.k = '%s' + and iconfig.v = '%s' and iid = %d limit 1", dbesc($i['service']), dbesc($i['sid']), - intval($r[0]['id']), - intval($channel['channel_id']) + intval($r[0]['id']) ); if(! $z) { - q("insert into item_id (iid,uid,sid,service) values(%d,%d,'%s','%s')", - intval($r[0]['id']), - intval($channel['channel_id']), - dbesc($i['sid']), - dbesc($i['service']) - ); + \Zotlabs\Lib\IConfig::Set($r[0]['id'],'system',$i['service'],$i['sid'],true); } } } |