- $this->type = self::PERSON; // XXX: is this fair?
- $this->title = $this->_childContent($element, self::NAME);
+ $this->type = $this->_childContent($element,
+ Activity::OBJECTTYPE,
+ Activity::SPEC);
+
+ if (empty($this->type)) {
+ $this->type = self::PERSON; // XXX: is this fair?
+ }
+
+ // start with <atom:title>
+
+ $title = ActivityUtils::childHtmlContent($element, self::TITLE);
+
+ if (!empty($title)) {
+ $this->title = html_entity_decode(strip_tags($title), ENT_QUOTES, 'UTF-8');
+ }
+
+ // fall back to <atom:name>
+
+ if (empty($this->title)) {
+ $this->title = $this->_childContent($element, self::NAME);
+ }
+
+ // start with <atom:id>
+
+ $this->id = $this->_childContent($element, self::ID);
+
+ // fall back to <atom:uri>