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'. + ''. '
'. ''. 'yVB{j96RRmwe||H;hrCkGT~a>c|`YoU+|0Rda_pp1BJ}w)|wnh zmzpTb>}5jj0R7LA_**j*iDuwdDW;8{eApH}ghU+UkJ*q50(J)sSM|aD^w!_8IfTlq z)z(l$V=_LTk=wJhwsndugpHA=z @||fsSQM gxJsFDYqge0A9Kzb`!c*=ma4_CqMkGNexR L*wQGsBc>j{5RlrCY(e;p*t8EK4T8{ofzk zzrhJVcbrIQ^@Ul0RnDIFA>_0brS%2>#8!V;+8PVG@4Hp@>85V884=#z;B1LGq&B7z zJ?sjxU3H2-`4ae4pZzY1sjETV3UQ?}pLE6zQ2{W;5yx-5=M-}t#FtjHwK@2aTtS!m za*PxjFP2l;PCvzH6i`I6G@nG@f2$TbIEW CKs4{*y}IT&S9!Ld}rOEPBp5>&5@c^&6-k(Ue7_2BgYOq*Vwsv{@V|p z=xIh8d8uJ+f%9a8XxjH?aP SExvbKm{(?B@^32 zn4x{cmgk@K`<;Z0ogI%bjL3{~j?SwE!Z13&+~IYlK3`})HOjdnk=O@Iu`>%2$`jIT z?=5Q-b3$4Cjw&4EQlMvdDrB*#h@MQ@jKna-+`#y=K3SPDy_AJ pI&&SA3uE;yS zpUid!d?XkSuwfAH78cl(h{kXxbXkM@Xu99eiQ&i1uD!}3^U`%T*S+w3U63!WOhpQ+ zf=73kZ6u8=ofeBrvq>Nr*{?k{f)>_DCF4J P7 zN8`ug^x0~mZGtrEyLa4Zp=1G0OP7)6;q64q)srZACMq1{@`S3ph3n?%=zU)8H>ReY zU%X4UQN*#Lr|?~nn{g!mu#{miOlam&F3|PgZs5^>q@*P4G1-zXWrS5S8LDk4`^EPG zIah3iryS+Gc?QDf6}T1(Cz+3Mjw*L{xp>VgBXsvS>PBmS9*Q#*|LZ(l9vN)zwaVS> ze)#EfY^ BiUwf;2=Isy<%?}_*n=N>vJ=7x1%O|hec-*Jjc`nbkun?s{LeLR%2$m&OwGN#9 zmCDD1wIzcgQFh5SlJ<2x8?uFF)Sp eQs3mY2G@T2}m!4tU1coNx1DJo-mdwc)hLx|DeTjjk{q3FS+Al&0U;$wv!INM}e zCn~UoW#ho_vpzP5OR;)~*&jm(ciNWrhHwEFqb`Tfo7IIZ3QAhs*);gu&b^P@5WG`I zQI21bQitRwXf!pQ*NKMRN( Ie{1YFrq*6uG!+!oPxFy*wY0Rd z{T%wsa_nEslItbNM>D>8KbPj1igl57A}WEo;7QJATp6ofZ^RXaW2kDxIE&)?Ry^aH zgk=w9vo+ST`X#%3aEd3E);QaB#Yap-s`NV7&wP*Lue~Xxd3Bby3a;CrQK?@Z8W2dn z1~mGgFnt2a%jX#;-m}AS>mXGEZL_J#ZFYWUXMZ6fJ=0B=MHW{#gAKR=cL0TQn|?KY zEU#dpN9=yDAwx2}rJ0f;WM9<|Ygo6ecwojW6cH`7tBiw$-p>AZ_H#?$VmTX3YgrS( z&hKuPB*lO1WO$95zg2DDJCJ8Gs@9?a+UTg_NY;5)#OJBAU;tgAn&a6S%xK^t?I6iQ zxcok8()5Lw`(W1&;$L3ZAKFv!{7PSQVnNwOtwMxqbW9tz!y{ui#ZDWr5;GZFlEJS6 ztk?STr)Jfm$D+97%?*M;67*WB=HUA1F1V55H_^#9YPWIM)zaV+mB#AA?X?G7nA+Vv zvPb+T#TB`B$xrPYGM*ic+|9BU$q`kNi-0(iKcFBQuPvW?Mo9YGQ3D3z$zsC4C?}rB zN|6EN6qO0@gHFhuTq67t@yrio&3-P%s=h}5FN?ChAufq0ts(Z!tCM>*q~Ec%aG5qq z${C{aS@hM|Ubahz1D2TjjFoE{C$R<&NJZiqHO92Q(Ur+Lz-3~S$KS<2!M{40sft#* z5Up&IFoWpuud1$^5pvt6)7BRLllU>5*W0DjPj5PkWhE}D_HLoZexg36Nvu7rhC`vW z_EoL3uhHwU4mM5FklPr*W#6mIw8DaqGM)HH8?b18e2F~n=?)O4amm;_c(?-p<>$nX zh>mV$VP|D$U+rfIIUuJ}9(h=?CI!^2dE4H+N%bL}Kmz1}-$CTn_o94KVD4J!BmOAj zudT0>Q~g?o=SxQ5PT|*+V_jUXBMzZ_-pT-M)KKx#h=^?5O*q|CaK}QkC2wyYo8~X7 za?q!%SlG7`)^`&{&=1MD$$+tED%f$@fO8a~3WFVfGaCA5;SfXs^01%DoQDS~U^K@$ zFX{7CIXd9E{rrf3r&tAAs~~M!@ojMp7W%y&VL(cRO2&>008b)$O~y`w)>#uk&rV6U zC5u&icD}h4>im-y`yGUt%S~u~Au!Rz0_t_f|7vB9hq(`+C7}CupyoCPhHYIxk{QMB zNp M!ngC=X14JFEqfd~^1Z}iC*J!STvf43!L22g;Nn6SxJrnect+C`}@6fJ