X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fapitimelineuser.php;h=62d0a5e0d5bbbd78319b3f0aa5aee6833be18ab5;hb=d48076253b02f8ab1f91e54289a189af7017db9f;hp=66984b5abda1ca47ad8dafd338ca98c215d5237e;hpb=81bcdfe2be9607998b6b34499c499b47ad76b525;p=quix0rs-gnu-social.git diff --git a/actions/apitimelineuser.php b/actions/apitimelineuser.php index 66984b5abd..62d0a5e0d5 100644 --- a/actions/apitimelineuser.php +++ b/actions/apitimelineuser.php @@ -202,7 +202,7 @@ class ApiTimelineUserAction extends ApiBareAuthAction $this->showJsonTimeline($this->notices); break; case 'as': - header('Content-Type: application/json; charset=utf-8'); + header('Content-Type: ' . ActivityStreamJSONDocument::CONTENT_TYPE); $doc = new ActivityStreamJSONDocument($this->auth_user); $doc->setTitle($atom->title); $doc->addLink($link, 'alternate', 'text/html'); @@ -213,7 +213,7 @@ class ApiTimelineUserAction extends ApiBareAuthAction $this->raw($doc->asString()); break; default: - // TRANS: Client error displayed when trying to handle an unknown API method. + // TRANS: Client error displayed when coming across a non-supported API method. $this->clientError(_('API method not found.'), $code = 404); break; } @@ -322,8 +322,11 @@ class ApiTimelineUserAction extends ApiBareAuthAction $this->clientError(_('Atom post must not be empty.')); } - $dom = DOMDocument::loadXML($xml); - if (!$dom) { + $old = error_reporting(error_reporting() & ~(E_WARNING | E_NOTICE)); + $dom = new DOMDocument(); + $ok = $dom->loadXML($xml); + error_reporting($old); + if (!$ok) { // TRANS: Client error displayed attempting to post an API that is not well-formed XML. $this->clientError(_('Atom post must be well-formed XML.')); } @@ -444,7 +447,7 @@ class ApiTimelineUserAction extends ApiBareAuthAction } else { $group = User_group::staticGet('uri', $uri); if (!empty($group)) { - $options['groups'][] = $uri; + $options['groups'][] = $group->id; } else { // @fixme: hook for discovery here common_log(LOG_WARNING, sprintf('AtomPub post with unknown attention URI %s', $uri));