diff options
| author | redmatrix <git@macgirvin.com> | 2016-06-27 04:00:10 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-06-27 04:00:10 -0700 |
| commit | 85d2ad4aea106417dc3d8ce2429d13dd858c5201 (patch) | |
| tree | 72e03b3fe379829a4e2f9c521366fb14e1eaa970 /Zotlabs/Module/Import_items.php | |
| parent | d5d5d78e3aded9a3238ccb7e93b4c6fd4b873331 (diff) | |
| parent | 8d298d5a068845856c9827c0d2ea3f02f1399d72 (diff) | |
| download | volse-hubzilla-85d2ad4aea106417dc3d8ce2429d13dd858c5201.tar.gz volse-hubzilla-85d2ad4aea106417dc3d8ce2429d13dd858c5201.tar.bz2 volse-hubzilla-85d2ad4aea106417dc3d8ce2429d13dd858c5201.zip | |
Merge branch 'dev' into perms
Diffstat (limited to 'Zotlabs/Module/Import_items.php')
| -rw-r--r-- | Zotlabs/Module/Import_items.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Module/Import_items.php b/Zotlabs/Module/Import_items.php index a862836c5..07b1c620c 100644 --- a/Zotlabs/Module/Import_items.php +++ b/Zotlabs/Module/Import_items.php @@ -92,7 +92,7 @@ class Import_items extends \Zotlabs\Web\Controller { if(array_key_exists('item',$data) && $data['item']) { - import_items($channel,$data['item']); + import_items($channel,$data['item'],false,((array_key_exists('relocate',$data)) ? $data['relocate'] : null)); } if(array_key_exists('item_id',$data) && $data['item_id']) { @@ -106,7 +106,7 @@ class Import_items extends \Zotlabs\Web\Controller { - function get() { + function get() { if(! local_channel()) { notice( t('Permission denied') . EOL); |