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/feedutils.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/feedutils.php')
| -rw-r--r-- | include/feedutils.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/feedutils.php b/include/feedutils.php index 9d0cf8cd6..72e2484c1 100644 --- a/include/feedutils.php +++ b/include/feedutils.php @@ -742,7 +742,7 @@ function encode_rel_links($links) { * @param $importer * The contact_record (joined to user_record) of the local user who owns this * relationship. It is this person's stuff that is going to be updated. - * @param array $contact[in,out] + * @param[in,out] array $contact * The person who is sending us stuff. If not set, we MAY be processing a "follow" activity * from an external network and MAY create an appropriate contact record. Otherwise, we MUST * have a contact record. @@ -1232,8 +1232,11 @@ function handle_feed($uid, $abook_id, $url) { /** * @brief Return a XML tag with author information. * + * @hooks \b atom_author Possibility to add further tags to returned XML string + * * \e string The created XML tag as a string without closing tag * @param string $tag The XML tag to create - * @param string $name Name of the author + * @param string $nick preferred username + * @param string $name displayed name of the author * @param string $uri * @param int $h image height * @param int $w image width |