Commit 2b869fa2 authored by Evan Prodromou's avatar Evan Prodromou

Merge remote branch 'origin/master'

parents 40533ee8 7de1aaf8
......@@ -106,8 +106,10 @@ class OthersettingsAction extends AccountSettingsAction
$services[$name]=$name;
if($value['freeService']){
// TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
// TRANS: user's profile settings. This message has one space at the beginning. Use your
// TRANS: language's word separator here if it has one (most likely a single space).
// TRANS: user's profile settings. Use of "free" is as in "open", indicating that the
// TRANS: information on the shortener site is freely distributable.
// TRANS: This message has one space at the beginning. Use your language's word separator
// TRANS: here if it has one (most likely a single space).
$services[$name].=_(' (free service)');
}
}
......
......@@ -546,7 +546,10 @@ class ActivityObject
if (!empty($this->title)) {
$name = common_xml_safe_str($this->title);
if ($tag == 'author') {
$xo->element(self::NAME, null, $name);
// XXX: Backward compatibility hack -- atom:name should contain
// full name here, instead of nickname, i.e.: $name. Change
// this in the next version.
$xo->element(self::NAME, null, $this->poco->preferredUsername);
} else {
$xo->element(self::TITLE, null, $name);
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment