diff options
author | Mario Vavti <mario@mariovavti.com> | 2016-06-22 09:58:55 +0200 |
---|---|---|
committer | Mario Vavti <mario@mariovavti.com> | 2016-06-22 09:58:55 +0200 |
commit | 5536df51f58a65f5a42051b0466b1c13c9a9718a (patch) | |
tree | e2000aa48946689e1c9e2b9d7b172854d69e2cbd /Zotlabs/Module/Import_items.php | |
parent | ecae0b3d97d759603bb2bf9bc51187a2842964c8 (diff) | |
parent | f48b12ff52c4fda85c09c1cc476f7cf4c0cfb649 (diff) | |
download | volse-hubzilla-5536df51f58a65f5a42051b0466b1c13c9a9718a.tar.gz volse-hubzilla-5536df51f58a65f5a42051b0466b1c13c9a9718a.tar.bz2 volse-hubzilla-5536df51f58a65f5a42051b0466b1c13c9a9718a.zip |
erge branch 'dev' into sabre32
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); |