From: mmn <mmn@hethane.se>
Date: Tue, 11 Jul 2017 20:01:01 +0000 (+0000)
Subject: Merge branch 'notice_id-xml' into 'nightly'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=924bcd93e5692288f976dd49f15ea3e15c080acc;p=quix0rs-gnu-social.git

Merge branch 'notice_id-xml' into 'nightly'

Use the statusnet namespace for notice_id in atom feed

See merge request !136
---

924bcd93e5692288f976dd49f15ea3e15c080acc
diff --cc classes/Notice.php
index 89c30d25fd,a4584cfd51..15b96ae670
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@@ -2214,13 -2170,8 +2214,13 @@@ class Notice extends Managed_DataObjec
              $object->title   = sprintf('New %1$s by %2$s', ActivityObject::canonicalType($object->type), $this->getProfile()->getNickname());
              $object->content = $this->getRendered();
              $object->link    = $this->getUrl();
 +            try {
 +                $object->selfLink = $this->getSelfLink();
 +            } catch (InvalidUrlException $e) {
 +                $object->selfLink = null;
 +            }
  
-             $object->extra[] = array('status_net', array('notice_id' => $this->id));
+             $object->extra[] = array('statusnet:notice_id', null, $this->id);
  
              Event::handle('EndActivityObjectFromNotice', array($this, &$object));
          }