diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-01-17 11:26:18 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-01-17 11:26:18 +0100 |
| commit | 256472f9eb3a1c929e5b43e2b6eb3bf0b0d5afe6 (patch) | |
| tree | 1f6778002328b27066ba86910f3f87bd060d6660 /include/import.php | |
| parent | af8449cef83376c65ff5ae9092dbe69f89294e69 (diff) | |
| parent | 9b3b2efe9aa374565c0c67bbc67c36f9c99d3add (diff) | |
| download | volse-hubzilla-256472f9eb3a1c929e5b43e2b6eb3bf0b0d5afe6.tar.gz volse-hubzilla-256472f9eb3a1c929e5b43e2b6eb3bf0b0d5afe6.tar.bz2 volse-hubzilla-256472f9eb3a1c929e5b43e2b6eb3bf0b0d5afe6.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/import.php')
| -rw-r--r-- | include/import.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/import.php b/include/import.php index ffaea6c1a..e208c3b00 100644 --- a/include/import.php +++ b/include/import.php @@ -496,6 +496,8 @@ function import_items($channel,$items) { } } + $deliver = false; // Don't deliver any messages or notifications when importing + foreach($items as $i) { $item = get_item_elements($i,$allow_code); if(! $item) @@ -509,16 +511,15 @@ function import_items($channel,$items) { if($item['edited'] > $r[0]['edited']) { $item['id'] = $r[0]['id']; $item['uid'] = $channel['channel_id']; - item_store_update($item); + item_store_update($item,$allow_code,$deliver); continue; } } else { $item['aid'] = $channel['channel_account_id']; $item['uid'] = $channel['channel_id']; - $item_result = item_store($item); + $item_result = item_store($item,$allow_code,$deliver); } - } } } |