diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -292,7 +292,6 @@
'rsrc/favicons/mstile-310x150.png' => '4a49d3ee',
'rsrc/favicons/mstile-310x310.png' => 'a52ab264',
'rsrc/favicons/mstile-70x70.png' => '5edce7b8',
- 'rsrc/favicons/opengraph-144x144.png' => '648fb0fc',
'rsrc/image/BFCFDA.png' => 'd5ec91f4',
'rsrc/image/actions/edit.png' => '2fc41442',
'rsrc/image/avatar.png' => '17d346a4',
diff --git a/src/applications/config/custom/PhabricatorCustomLogoConfigType.php b/src/applications/config/custom/PhabricatorCustomLogoConfigType.php
--- a/src/applications/config/custom/PhabricatorCustomLogoConfigType.php
+++ b/src/applications/config/custom/PhabricatorCustomLogoConfigType.php
@@ -13,39 +13,6 @@
return idx($logo, 'wordmarkText');
}
- public static function getLogoURI(PhabricatorUser $viewer) {
- $logo_uri = null;
-
- $custom_header = self::getLogoImagePHID();
- if ($custom_header) {
- $cache = PhabricatorCaches::getImmutableCache();
- $cache_key_logo = 'ui.custom-header.logo-phid.v3.'.$custom_header;
- $logo_uri = $cache->getKey($cache_key_logo);
-
- if (!$logo_uri) {
- // NOTE: If the file policy has been changed to be restrictive, we'll
- // miss here and just show the default logo. The cache will fill later
- // when someone who can see the file loads the page. This might be a
- // little spooky, see T11982.
- $files = id(new PhabricatorFileQuery())
- ->setViewer($viewer)
- ->withPHIDs(array($custom_header))
- ->execute();
- $file = head($files);
- if ($file) {
- $logo_uri = $file->getViewURI();
- $cache->setKey($cache_key_logo, $logo_uri);
- }
- }
- }
-
- if (!$logo_uri) {
- $logo_uri = celerity_get_resource_uri('/rsrc/image/logo/light-eye.png');
- }
-
- return $logo_uri;
- }
-
public function validateOption(PhabricatorConfigOption $option, $value) {
if (!is_array($value)) {
throw new Exception(
diff --git a/src/view/page/AphrontPageView.php b/src/view/page/AphrontPageView.php
--- a/src/view/page/AphrontPageView.php
+++ b/src/view/page/AphrontPageView.php
@@ -59,15 +59,9 @@
),
array($body, $tail));
- if (PhabricatorEnv::getEnvConfig('policy.allow-public')) {
- $html_open_tag = hsprintf('');
- } else {
- $html_open_tag = hsprintf('');
- }
-
$response = hsprintf(
''.
- '%s'.
+ ''.
''.
''.
'%s'.
@@ -75,7 +69,6 @@
''.
'%s'.
'',
- $html_open_tag,
$title,
$head,
$body);
diff --git a/src/view/page/PhabricatorStandardPageView.php b/src/view/page/PhabricatorStandardPageView.php
--- a/src/view/page/PhabricatorStandardPageView.php
+++ b/src/view/page/PhabricatorStandardPageView.php
@@ -426,11 +426,10 @@
}
return hsprintf(
- '%s%s%s%s',
+ '%s%s%s',
parent::getHead(),
$font_css,
- $response->renderSingleResource('javelin-magical-init', 'phabricator'),
- $this->newOpenGraphTags());
+ $response->renderSingleResource('javelin-magical-init', 'phabricator'));
}
public function setGlyph($glyph) {
@@ -912,45 +911,4 @@
return $response;
}
- private function newOpenGraphTags() {
- // If we don't allow public access, there's no point in emitting OpenGraph
- // tags because external systems can't fetch pages.
- if (!PhabricatorEnv::getEnvConfig('policy.allow-public')) {
- return array();
- }
-
- $viewer = $this->getViewer();
-
- $properties = array(
- array(
- 'og:title',
- $this->getTitle(),
- ),
- array(
- 'og:type',
- 'website',
- ),
- array(
- 'og:url',
- PhabricatorEnv::getProductionURI($this->getRequest()->getRequestURI()),
- ),
- array(
- 'og:image',
- celerity_get_resource_uri('rsrc/favicons/opengraph-144x144.png'),
- ),
- );
-
- $tags = array();
- foreach ($properties as $property) {
- $tags[] = phutil_tag(
- 'meta',
- array(
- 'property' => $property[0],
- 'content' => $property[1],
- ));
- }
-
- return $tags;
- }
-
}
diff --git a/src/view/page/menu/PhabricatorMainMenuView.php b/src/view/page/menu/PhabricatorMainMenuView.php
--- a/src/view/page/menu/PhabricatorMainMenuView.php
+++ b/src/view/page/menu/PhabricatorMainMenuView.php
@@ -262,16 +262,35 @@
}
private function renderPhabricatorLogo() {
- $logo_style = array();
-
$custom_header = PhabricatorCustomLogoConfigType::getLogoImagePHID();
+
+ $logo_style = array();
if ($custom_header) {
- $viewer = $this->getViewer();
- $logo_uri = PhabricatorCustomLogoConfigType::getLogoURI($viewer);
+ $cache = PhabricatorCaches::getImmutableCache();
+ $cache_key_logo = 'ui.custom-header.logo-phid.v3.'.$custom_header;
+
+ $logo_uri = $cache->getKey($cache_key_logo);
+ if (!$logo_uri) {
+ // NOTE: If the file policy has been changed to be restrictive, we'll
+ // miss here and just show the default logo. The cache will fill later
+ // when someone who can see the file loads the page. This might be a
+ // little spooky, see T11982.
+ $files = id(new PhabricatorFileQuery())
+ ->setViewer($this->getViewer())
+ ->withPHIDs(array($custom_header))
+ ->execute();
+ $file = head($files);
+ if ($file) {
+ $logo_uri = $file->getViewURI();
+ $cache->setKey($cache_key_logo, $logo_uri);
+ }
+ }
- $logo_style[] = 'background-size: 40px 40px;';
- $logo_style[] = 'background-position: 0 0;';
- $logo_style[] = 'background-image: url('.$logo_uri.')';
+ if ($logo_uri) {
+ $logo_style[] = 'background-size: 40px 40px;';
+ $logo_style[] = 'background-position: 0 0;';
+ $logo_style[] = 'background-image: url('.$logo_uri.')';
+ }
}
$logo_node = phutil_tag(
@@ -281,6 +300,7 @@
'style' => implode(' ', $logo_style),
));
+
$wordmark_text = PhabricatorCustomLogoConfigType::getLogoWordmark();
if (!strlen($wordmark_text)) {
$wordmark_text = pht('Phabricator');
diff --git a/webroot/rsrc/favicons/opengraph-144x144.png b/webroot/rsrc/favicons/opengraph-144x144.png
deleted file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@