wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit 'refs/merge-requests/26' of https://gitorious.org/social/mainline into merge-requests/26

Browse Source
This commit is contained in:
Mikael Nordfeldth 2014-12-09 13:45:15 +01:00
commit d3a8896b2a
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/activityobject.php
View File

@ -195,15 +195,22 @@ class ActivityObject
$this->type = self::PERSON; // XXX: is this fair?
}
// start with <atom:title>
$title = ActivityUtils::childHtmlContent($element, self::TITLE);
// Start with <poco::displayName>
if (!empty($title)) {
$this->title = common_strip_html($title);
$this->title = ActivityUtils::childContent($element, PoCo::DISPLAYNAME, PoCo::NS);
// try falling back to <atom:title>
if (empty($this->title)) {
$title = ActivityUtils::childHtmlContent($element, self::TITLE);
if (!empty($title)) {
$this->title = common_strip_html($title);
}
}
// fall back to <atom:name>
// fall back to <atom:name> as a last resort
if (empty($this->title)) {
$this->title = $this->_childContent($element, self::NAME);

5
plugins/OStatus/scripts/update-profile-data.php
View File

@ -26,7 +26,8 @@ $helptext = <<<END_OF_HELP
update-profile-data.php [options] [http://example.com/profile/url]
Rerun profile discovery for the given OStatus remote profile, and save the
updated profile data (nickname, avatar, bio, etc). Doesn't touch feed state.
updated profile data (nickname, fullname, avatar, bio, etc).
Doesn't touch feed state.
Can be used to clean up after breakages.
Options:
@ -44,7 +45,7 @@ function showProfileInfo(Ostatus_profile $oprofile) {
} else {
$profile = $oprofile->localProfile();
try {
foreach (array('nickname', 'bio', 'homepage', 'location') as $field) {
foreach (array('nickname', 'fullname', 'bio', 'homepage', 'location') as $field) {
print " $field: {$profile->$field}\n";
}
} catch (NoProfileException $e) {