Always give users "fa-user" icons in tokenizers

Summary: Fixes T10247. The flavor icons are unhelpful/confusing in these contexts; show a boringer icon instead.

Test Plan: Used tokenizer to select user with custom profile icon. Reloaded page. Saw boringer icon in both cases.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T10247

Differential Revision: https://secure.phabricator.com/D15154

src/applications/people/phid/PhabricatorPeopleUserPHIDType.php

@@ -54,8 +54,10 @@ final class PhabricatorPeopleUserPHIDType extends PhabricatorPHIDType {
         $icon_icon = PhabricatorPeopleIconSet::getIconIcon($icon_key);
         $subtitle = $profile->getDisplayTitle();
 
-        $handle->setIcon($icon_icon);
+        $handle
-        $handle->setSubtitle($subtitle);
+          ->setIcon($icon_icon)
+          ->setSubtitle($subtitle)
+          ->setTokenIcon('fa-user');
       }
 
       $availability = null;

src/applications/phid/PhabricatorObjectHandle.php

@@ -28,6 +28,7 @@ final class PhabricatorObjectHandle
   private $objectName;
   private $policyFiltered;
   private $subtitle;
+  private $tokenIcon;
 
   public function setIcon($icon) {
     $this->icon = $icon;
@@ -86,6 +87,19 @@ final class PhabricatorObjectHandle
     return null;
   }
 
+  public function setTokenIcon($icon) {
+    $this->tokenIcon = $icon;
+    return $this;
+  }
+
+  public function getTokenIcon() {
+    if ($this->tokenIcon !== null) {
+      return $this->tokenIcon;
+    }
+
+    return $this->getIcon();
+  }
+
   public function getTypeIcon() {
     if ($this->getPHIDType()) {
       return $this->getPHIDType()->getTypeIcon();

src/applications/typeahead/view/PhabricatorTypeaheadTokenView.php

@@ -32,7 +32,7 @@ final class PhabricatorTypeaheadTokenView
     $token = id(new PhabricatorTypeaheadTokenView())
       ->setKey($handle->getPHID())
       ->setValue($handle->getFullName())
-      ->setIcon($handle->getIcon());
+      ->setIcon($handle->getTokenIcon());
 
     if ($handle->isDisabled() ||
         $handle->getStatus() == PhabricatorObjectHandle::STATUS_CLOSED) {