Merge branch 'notice_id-xml' into 'nightly'

Use the statusnet namespace for notice_id in atom feed

See merge request !136

diff --cc classes/Notice.php
index 89c30d25fde879712288658372387180ac720bd0,a4584cfd51a1ce185b588112c8c23091ffd2b563..15b96ae670a01aa7b4a0e75416042ffe60cd7492
--- 1/classes/Notice.php
--- 2/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));
          }