diff options
| author | M. Dent <dentm42@gmail.com> | 2019-03-08 05:45:02 +0100 |
|---|---|---|
| committer | M. Dent <dentm42@gmail.com> | 2019-03-08 05:45:02 +0100 |
| commit | b8d79d91322b23cfcf9810efd15ac7e4fb282779 (patch) | |
| tree | 74bf20be28287eebd64b2aa2961f81670dfcef8e | |
| parent | c0b238b19a91650a633e350fdd91736b40e88223 (diff) | |
| parent | 507c71f64c68cc0de0f090f1abdd024866e91068 (diff) | |
| download | volse-hubzilla-b8d79d91322b23cfcf9810efd15ac7e4fb282779.tar.gz volse-hubzilla-b8d79d91322b23cfcf9810efd15ac7e4fb282779.tar.bz2 volse-hubzilla-b8d79d91322b23cfcf9810efd15ac7e4fb282779.zip | |
Merge branch 'core_fixes_1' into 'dev'
$sender is supposed to be string in libzot
See merge request hubzilla/core!1544
| -rw-r--r-- | Zotlabs/Lib/Libzot.php | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/Zotlabs/Lib/Libzot.php b/Zotlabs/Lib/Libzot.php index bc0826189..fd1538f0b 100644 --- a/Zotlabs/Lib/Libzot.php +++ b/Zotlabs/Lib/Libzot.php @@ -1895,8 +1895,7 @@ class Libzot { /** * @brief Remove community tag. * - * @param array $sender an associative array with - * * \e string \b hash a xchan_hash + * @param string $sender * @param array $arr an associative array * * \e int \b verb * * \e int \b obj_type @@ -1969,7 +1968,7 @@ class Libzot { * * @see item_store_update() * - * @param array $sender + * @param string $sender * @param array $item * @param array $orig * @param int $uid @@ -2020,7 +2019,7 @@ class Libzot { /** * @brief Deletes an imported item. * - * @param array $sender + * @param string $sender * * \e string \b hash a xchan_hash * @param array $item * @param int $uid @@ -2038,9 +2037,9 @@ class Libzot { $r = q("select id, author_xchan, owner_xchan, source_xchan, item_deleted from item where ( author_xchan = '%s' or owner_xchan = '%s' or source_xchan = '%s' ) and mid = '%s' and uid = %d limit 1", - dbesc($sender['hash']), - dbesc($sender['hash']), - dbesc($sender['hash']), + dbesc($sender), + dbesc($sender), + dbesc($sender), dbesc($item['mid']), intval($uid) ); @@ -2195,8 +2194,7 @@ class Libzot { * * @see import_directory_profile() * - * @param array $sender an associative array - * * \e string \b hash a xchan_hash + * @param string $sender * @param array $arr * @param array $deliveries (unused) * @return void @@ -2206,7 +2204,7 @@ class Libzot { logger('process_profile_delivery', LOGGER_DEBUG); $r = q("select xchan_addr from xchan where xchan_hash = '%s' limit 1", - dbesc($sender['hash']) + dbesc($sender) ); if($r) { Libzotdir::import_directory_profile($sender, $arr, $r[0]['xchan_addr'], UPDATE_FLAGS_UPDATED, 0); @@ -2217,8 +2215,7 @@ class Libzot { /** * @brief * - * @param array $sender an associative array - * * \e string \b hash a xchan_hash + * @param string $sender * @param array $arr * @param array $deliveries (unused) deliveries is irrelevant * @return void |