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

diff --git a/plugins/ActivityModeration/classes/Deleted_notice.php b/plugins/ActivityModeration/classes/Deleted_notice.php
index 4ffc0c895fe804f3c9229f986ea6b990aa5dded0..05414caab2ee75327cbcd2f984a6039f6f931f94 100644 (file)
--- a/plugins/ActivityModeration/classes/Deleted_notice.php
+++ b/plugins/ActivityModeration/classes/Deleted_notice.php
@@ -151,9 +151,11 @@ class Deleted_notice extends Managed_DataObject
         $actobj->title = ActivityUtils::verbToTitle($actobj->verb);
 
         $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}}.'),
                             htmlspecialchars($actor->getUrl()),
-                            htmlspecialchars($actor->getBestName()),
+                            htmlspecialchars($actor->getFancyName()),
                             htmlspecialchars($this->getUri())
                            );
 

diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php
index 292af658ed9a98b5c411ef0eb9f029866c72ff78..d702703c81afb30df2e8d0d625dd89beee39459a 100644 (file)
--- a/plugins/OStatus/OStatusPlugin.php
+++ b/plugins/OStatus/OStatusPlugin.php
@@ -312,7 +312,7 @@ class OStatusPlugin extends Plugin
                 assert($profile instanceof Profile);
 
                 $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;
                 $url = $profile->getUri();
                 if (!common_valid_http_url($url)) {