From f2f896c761a2415607e45b6d5524ae40d125f652 Mon Sep 17 00:00:00 2001 From: Josh Cox Date: Mon, 29 Aug 2016 17:58:49 -0400 Subject: [PATCH] Removed all instances of getIconURI Summary: Fixes T11541. `PhabricatorApplication::getIconURI()` has been returning only null for a while (I assume in preparation to remove it). I removed the method and all the remaining call sites. Test Plan: Removed the method and then clicked around. Things didn't explode! Reviewers: #blessed_reviewers, epriestley Reviewed By: #blessed_reviewers, epriestley Subscribers: epriestley, yelirekim Maniphest Tasks: T11541 Differential Revision: https://secure.phabricator.com/D16470 --- src/applications/base/PhabricatorApplication.php | 4 ---- .../typeahead/PhabricatorApplicationDatasource.php | 1 - .../meta/view/PhabricatorApplicationLaunchView.php | 11 +++-------- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/src/applications/base/PhabricatorApplication.php b/src/applications/base/PhabricatorApplication.php index 82b094c311..b45b1be102 100644 --- a/src/applications/base/PhabricatorApplication.php +++ b/src/applications/base/PhabricatorApplication.php @@ -151,10 +151,6 @@ abstract class PhabricatorApplication return $this->getBaseURI().ltrim($path, '/'); } - public function getIconURI() { - return null; - } - public function getIcon() { return 'fa-puzzle-piece'; } diff --git a/src/applications/meta/typeahead/PhabricatorApplicationDatasource.php b/src/applications/meta/typeahead/PhabricatorApplicationDatasource.php index 7dddeda53b..2a78afa655 100644 --- a/src/applications/meta/typeahead/PhabricatorApplicationDatasource.php +++ b/src/applications/meta/typeahead/PhabricatorApplicationDatasource.php @@ -36,7 +36,6 @@ final class PhabricatorApplicationDatasource ->setPriorityString($application->getName()) ->setDisplayName($application->getName()) ->setDisplayType($application->getShortDescription()) - ->setImageuRI($application->getIconURI()) ->setPriorityType('apps') ->setImageSprite('phabricator-search-icon '.$img) ->setIcon($application->getIcon()) diff --git a/src/applications/meta/view/PhabricatorApplicationLaunchView.php b/src/applications/meta/view/PhabricatorApplicationLaunchView.php index 95c3777d4e..4f337f013c 100644 --- a/src/applications/meta/view/PhabricatorApplicationLaunchView.php +++ b/src/applications/meta/view/PhabricatorApplicationLaunchView.php @@ -109,14 +109,9 @@ final class PhabricatorApplicationLaunchView extends AphrontTagView { $classes = array(); $classes[] = 'phabricator-application-launch-icon'; $styles = array(); - - if ($application->getIconURI()) { - $styles[] = 'background-image: url('.$application->getIconURI().')'; - } else { - $classes[] = $application->getIcon(); - $classes[] = 'phui-icon-view'; - $classes[] = 'phui-font-fa'; - } + $classes[] = $application->getIcon(); + $classes[] = 'phui-icon-view'; + $classes[] = 'phui-font-fa'; $icon = phutil_tag( 'span',