diff options
| author | habeascodice <habeascodice@federated.social> | 2014-10-09 01:06:59 -0700 |
|---|---|---|
| committer | habeascodice <habeascodice@federated.social> | 2014-10-09 01:06:59 -0700 |
| commit | 7a106cf60cfa005ec6d8c35f922dc57b9af0175e (patch) | |
| tree | 34b0593f9922f33d9e2c2c517ba9f6e9d3490c44 /mod/import.php | |
| parent | 737a3362d50900a5f26aada14f515c5c857a762f (diff) | |
| parent | fc0576acf810019a0c168bfa4dc4a2175ae0b505 (diff) | |
| download | volse-hubzilla-7a106cf60cfa005ec6d8c35f922dc57b9af0175e.tar.gz volse-hubzilla-7a106cf60cfa005ec6d8c35f922dc57b9af0175e.tar.bz2 volse-hubzilla-7a106cf60cfa005ec6d8c35f922dc57b9af0175e.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'mod/import.php')
| -rw-r--r-- | mod/import.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mod/import.php b/mod/import.php index e5a22a26e..3cf114d66 100644 --- a/mod/import.php +++ b/mod/import.php @@ -378,7 +378,10 @@ function import_post(&$a) { } } + $saved_notification_flags = notifications_off($channel['channel_id']); + if($import_posts && array_key_exists('item',$data) && $data['item']) { + foreach($data['item'] as $i) { $item = get_item_elements($i); @@ -404,6 +407,8 @@ function import_post(&$a) { } + notifications_on($channel['channel_id'],$saved_notification_flags); + if(array_key_exists('item_id',$data) && $data['item_id']) { foreach($data['item_id'] as $i) { $r = q("select id from item where mid = '%s' and uid = %d limit 1", |