GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Some changes since getFancyName() is longer with full acct: URI

Browse Source
This commit is contained in:
Mikael Nordfeldth 2016-03-02 00:13:28 +01:00
parent 7ec69e4215
commit 9a89990293
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/ActivityModeration/classes/Deleted_notice.php
View File

@ -151,9 +151,11 @@ class Deleted_notice extends Managed_DataObject
$actobj->title = ActivityUtils::verbToTitle($actobj->verb); $actobj->title = ActivityUtils::verbToTitle($actobj->verb);
$actor = $this->getActor(); $actor = $this->getActor();
// TRANS: Notice HTML content of a deleted notice. %1$s is the
// TRANS: actor's URL, %2$s its "fancy name" and %3$s the notice URI.
$actobj->content = sprintf(_m('<a href="%1$s">%2$s</a> deleted notice {{%3$s}}.'), $actobj->content = sprintf(_m('<a href="%1$s">%2$s</a> deleted notice {{%3$s}}.'),
htmlspecialchars($actor->getUrl()), htmlspecialchars($actor->getUrl()),
htmlspecialchars($actor->getBestName()), htmlspecialchars($actor->getFancyName()),
htmlspecialchars($this->getUri()) htmlspecialchars($this->getUri())
); );

2
plugins/OStatus/OStatusPlugin.php
View File

@ -312,7 +312,7 @@ class OStatusPlugin extends Plugin
assert($profile instanceof Profile); assert($profile instanceof Profile);
$text = !empty($profile->nickname) && mb_strlen($profile->nickname) < mb_strlen($target) $text = !empty($profile->nickname) && mb_strlen($profile->nickname) < mb_strlen($target)
? $profile->getNickname() // TODO: we could do getFancyName() or getFullname() here ? $profile->getNickname() // TODO: we could do getBestName() or getFullname() here
: $target; : $target;
$url = $profile->getUri(); $url = $profile->getUri();
if (!common_valid_http_url($url)) { if (!common_valid_http_url($url)) {