diff options
| author | zotlabs <mike@macgirvin.com> | 2017-05-05 16:58:46 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-05-05 16:58:46 -0700 |
| commit | f840082aaead8356a5787109f0c67179ecdf7993 (patch) | |
| tree | 05fcb73fae9412706a04a44a3188a187375d3ca4 /include/import.php | |
| parent | 47ebddf99f5487cbcdfbabaa367c7b09fa0a86e3 (diff) | |
| parent | 3ccefa20e8b10d0a507c6b002237664e721ca389 (diff) | |
| download | volse-hubzilla-f840082aaead8356a5787109f0c67179ecdf7993.tar.gz volse-hubzilla-f840082aaead8356a5787109f0c67179ecdf7993.tar.bz2 volse-hubzilla-f840082aaead8356a5787109f0c67179ecdf7993.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'include/import.php')
| -rw-r--r-- | include/import.php | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/include/import.php b/include/import.php index d67689290..f219bc780 100644 --- a/include/import.php +++ b/include/import.php @@ -181,7 +181,7 @@ function import_profiles($channel, $profiles) { * @param array $channel * @param array $hublocs * @param unknown $seize - * @param boolean $moving + * @param boolean $moving (optional) default false */ function import_hublocs($channel, $hublocs, $seize, $moving = false) { @@ -585,7 +585,7 @@ function sync_chatrooms($channel, $chatrooms) { * * @param array $channel where to import to * @param array $items - * @param boolean $sync + * @param boolean $sync default false * @param array $relocate default null */ function import_items($channel, $items, $sync = false, $relocate = null) { @@ -648,9 +648,13 @@ function sync_items($channel, $items, $relocate = null) { import_items($channel, $items, true, $relocate); } - - -function import_item_ids($channel,$itemids) { +/** + * @brief + * + * @param array $channel A channel array. + * @param array $itemids + */ +function import_item_ids($channel, $itemids) { if($channel && $itemids) { foreach($itemids as $i) { $r = q("select id from item where mid = '%s' and uid = %d limit 1", @@ -973,6 +977,7 @@ function import_conv($channel,$convs) { * * @param array $channel * @param array $mails + * @param boolean $sync (optional) default false */ function import_mail($channel, $mails, $sync = false) { if($channel && $mails) { @@ -1267,7 +1272,7 @@ function sync_files($channel, $files) { * * Replaces $old key with $new key in $arr. * - * @param array[in,out] $arr The array where to work on + * @param[in,out] array &$arr The array where to work on * @param string $old The old key in the array * @param string $new The new key in the array */ @@ -1435,7 +1440,7 @@ function import_webpage_element($element, $channel, $type) { // The author is either the owner or whomever was specified $arr['author_xchan'] = (($element['author_xchan']) ? $element['author_xchan'] : get_observer_hash()); // Import mimetype if it is a valid mimetype for the element - $mimetypes = [ + $mimetypes = [ 'text/bbcode', 'text/html', 'text/markdown', |