harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

$sender is supposed to be string in libzot

Browse Source 
(cherry picked from commit 507c71f64c)
This commit is contained in:
Mario 2019-03-08 04:45:02 +00:00
parent e352cfc861
commit 853fb33913
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Zotlabs/Lib/Libzot.php
View File

@ -1895,8 +1895,7 @@ class Libzot {
/** /**
* @brief Remove community tag. * @brief Remove community tag.
* *
* @param array $sender an associative array with * @param string $sender
* * \e string \b hash a xchan_hash
* @param array $arr an associative array * @param array $arr an associative array
* * \e int \b verb * * \e int \b verb
* * \e int \b obj_type * * \e int \b obj_type
@ -1969,7 +1968,7 @@ class Libzot {
* *
* @see item_store_update() * @see item_store_update()
* *
* @param array $sender * @param string $sender
* @param array $item * @param array $item
* @param array $orig * @param array $orig
* @param int $uid * @param int $uid
@ -2020,7 +2019,7 @@ class Libzot {
/** /**
* @brief Deletes an imported item. * @brief Deletes an imported item.
* *
* @param array $sender * @param string $sender
* * \e string \b hash a xchan_hash * * \e string \b hash a xchan_hash
* @param array $item * @param array $item
* @param int $uid * @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' ) $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", and mid = '%s' and uid = %d limit 1",
dbesc($sender['hash']), dbesc($sender),
dbesc($sender['hash']), dbesc($sender),
dbesc($sender['hash']), dbesc($sender),
dbesc($item['mid']), dbesc($item['mid']),
intval($uid) intval($uid)
); );
@ -2195,8 +2194,7 @@ class Libzot {
* *
* @see import_directory_profile() * @see import_directory_profile()
* *
* @param array $sender an associative array * @param string $sender
* * \e string \b hash a xchan_hash
* @param array $arr * @param array $arr
* @param array $deliveries (unused) * @param array $deliveries (unused)
* @return void * @return void
@ -2206,7 +2204,7 @@ class Libzot {
logger('process_profile_delivery', LOGGER_DEBUG); logger('process_profile_delivery', LOGGER_DEBUG);
$r = q("select xchan_addr from xchan where xchan_hash = '%s' limit 1", $r = q("select xchan_addr from xchan where xchan_hash = '%s' limit 1",
dbesc($sender['hash']) dbesc($sender)
); );
if($r) { if($r) {
Libzotdir::import_directory_profile($sender, $arr, $r[0]['xchan_addr'], UPDATE_FLAGS_UPDATED, 0); Libzotdir::import_directory_profile($sender, $arr, $r[0]['xchan_addr'], UPDATE_FLAGS_UPDATED, 0);
@ -2217,8 +2215,7 @@ class Libzot {
/** /**
* @brief * @brief
* *
* @param array $sender an associative array * @param string $sender
* * \e string \b hash a xchan_hash
* @param array $arr * @param array $arr
* @param array $deliveries (unused) deliveries is irrelevant * @param array $deliveries (unused) deliveries is irrelevant
* @return void * @return void