revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-12-22 13:30:55 +01:00
Code Issues Releases Wiki Activity

Ensure Aphlict is served on the primary domain

Browse source 
Summary: This ensure that Aphlict is always served on the primary / production domain, because the alternate file domain is intended to prevent Flash execution.

Test Plan: Confirmed this fixes the issue by visiting https://code.redpointsoftware.com.au/ and seeing notification messages.

Reviewers: joshuaspence, #blessed_reviewers, epriestley

Reviewed By: #blessed_reviewers, epriestley

Subscribers: epriestley, Korvin

Differential Revision: https://secure.phabricator.com/D9511
This commit is contained in:
James Rhodes 2014-06-13 05:47:06 -07:00 committed by epriestley
parent 18757e43de
commit 3dc7876117
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/infrastructure/celerity/CelerityStaticResourceResponse.php
View file

@ -283,7 +283,8 @@ final class CelerityStaticResourceResponse {
public function getURI( public function getURI(
CelerityResourceMap $map, CelerityResourceMap $map,
$name) { $name,
$use_primary_domain = false) {
$uri = $map->getURIForName($name); $uri = $map->getURIForName($name);
@ -298,7 +299,11 @@ final class CelerityStaticResourceResponse {
$uri = preg_replace('@^/res/@', '/res/'.$mtime.'T/', $uri); $uri = preg_replace('@^/res/@', '/res/'.$mtime.'T/', $uri);
} }
if ($use_primary_domain) {
return PhabricatorEnv::getURI($uri);
} else {
return PhabricatorEnv::getCDNURI($uri); return PhabricatorEnv::getCDNURI($uri);
} }
}
} }

2
src/view/page/PhabricatorStandardPageView.php
View file

@ -373,7 +373,7 @@ final class PhabricatorStandardPageView extends PhabricatorBarePageView {
} }
$map = CelerityResourceMap::getNamedInstance('phabricator'); $map = CelerityResourceMap::getNamedInstance('phabricator');
$swf_uri = $response->getURI($map, 'rsrc/swf/aphlict.swf'); $swf_uri = $response->getURI($map, 'rsrc/swf/aphlict.swf', true);
$enable_debug = PhabricatorEnv::getEnvConfig('notification.debug'); $enable_debug = PhabricatorEnv::getEnvConfig('notification.debug');