aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Lib
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2019-03-08 14:56:13 -0800
committerzotlabs <mike@macgirvin.com>2019-03-08 14:56:13 -0800
commit220d6ed494c1c1aa1bd1365f485e0543c2baa800 (patch)
treec71a857cc1a91ba7af99b9771b0d7afbe000e6e6 /Zotlabs/Lib
parentb5ed3edc8f3e2a442d836ddef8ffa9114b49e523 (diff)
parent73c96f35c1b1e50518179f430ceaa3ebc0a7d643 (diff)
downloadvolse-hubzilla-220d6ed494c1c1aa1bd1365f485e0543c2baa800.tar.gz
volse-hubzilla-220d6ed494c1c1aa1bd1365f485e0543c2baa800.tar.bz2
volse-hubzilla-220d6ed494c1c1aa1bd1365f485e0543c2baa800.zip
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'Zotlabs/Lib')
-rw-r--r--Zotlabs/Lib/Libzot.php21
1 files changed, 9 insertions, 12 deletions
diff --git a/Zotlabs/Lib/Libzot.php b/Zotlabs/Lib/Libzot.php
index 50053a2fd..70602bbbc 100644
--- a/Zotlabs/Lib/Libzot.php
+++ b/Zotlabs/Lib/Libzot.php
@@ -1897,8 +1897,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
@@ -1971,7 +1970,7 @@ class Libzot {
*
* @see item_store_update()
*
- * @param array $sender
+ * @param string $sender
* @param array $item
* @param array $orig
* @param int $uid
@@ -2022,7 +2021,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
@@ -2040,9 +2039,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)
);
@@ -2197,8 +2196,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
@@ -2208,7 +2206,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);
@@ -2219,8 +2217,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