diff options
| author | Klaus Weidenbach <Klaus.Weidenbach@gmx.net> | 2019-01-18 22:17:10 +0100 |
|---|---|---|
| committer | Klaus Weidenbach <Klaus.Weidenbach@gmx.net> | 2019-01-23 22:25:47 +0100 |
| commit | 13e0151cd2569832588cc9a973bcf40d850edd53 (patch) | |
| tree | 1d2054ca8b9edd9435d1ffa4c2584afea9121102 /include/import.php | |
| parent | 51a7be29f50c4c62a2afb0ed155df43af9351fad (diff) | |
| download | volse-hubzilla-13e0151cd2569832588cc9a973bcf40d850edd53.tar.gz volse-hubzilla-13e0151cd2569832588cc9a973bcf40d850edd53.tar.bz2 volse-hubzilla-13e0151cd2569832588cc9a973bcf40d850edd53.zip | |
Correct and extend Doxygen comments.
Correct some documentation errors for Doxygen and add
more comments.
Document some undefined variables with @FIXME.
Diffstat (limited to 'include/import.php')
| -rw-r--r-- | include/import.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/import.php b/include/import.php index 3bd8b4105..f391400bd 100644 --- a/include/import.php +++ b/include/import.php @@ -12,6 +12,7 @@ require_once('include/perm_upgrade.php'); * @param array $channel * @param int $account_id * @param int $seize + * @param string $newname (optional) * @return boolean|array */ function import_channel($channel, $account_id, $seize, $newname = '') { @@ -650,7 +651,7 @@ function import_items($channel, $items, $sync = false, $relocate = null) { // preserve conversations you've been involved in from being expired $stored = $item_result['item']; - if((is_array($stored)) && ($stored['id'] != $stored['parent']) + if((is_array($stored)) && ($stored['id'] != $stored['parent']) && ($stored['author_xchan'] === $channel['channel_hash'])) { retain_item($stored['item']['parent']); } @@ -672,7 +673,7 @@ function import_items($channel, $items, $sync = false, $relocate = null) { /** * @brief Sync items to channel. * - * @see import_items + * @see import_items() * * @param array $channel where to import to * @param array $items @@ -1049,7 +1050,7 @@ function import_mail($channel, $mails, $sync = false) { /** * @brief Synchronise mails. * - * @see import_mail + * @see import_mail() * @param array $channel * @param array $mails */ @@ -1337,7 +1338,7 @@ function sync_files($channel, $files) { if($str) $str .= ","; - + $str .= " " . TQUOT . $k . TQUOT . " = '" . (($k === 'content') ? dbescbin($v) : dbesc($v)) . "' "; } $r = dbq("update photo set " . $str . " where id = " . intval($exists[0]['id']) ); |