D9511.id22793.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D9511.id22793.diff
View Options

	diff --git a/src/infrastructure/celerity/CelerityStaticResourceResponse.php b/src/infrastructure/celerity/CelerityStaticResourceResponse.php
	--- a/src/infrastructure/celerity/CelerityStaticResourceResponse.php
	+++ b/src/infrastructure/celerity/CelerityStaticResourceResponse.php
	@@ -283,7 +283,8 @@

	public function getURI(
	CelerityResourceMap $map,
	- $name) {
	+ $name,
	+ $use_primary_domain = false) {

	$uri = $map->getURIForName($name);

	@@ -298,7 +299,11 @@
	$uri = preg_replace('@^/res/@', '/res/'.$mtime.'T/', $uri);
	}

	- return PhabricatorEnv::getCDNURI($uri);
	+ if ($use_primary_domain) {
	+ return PhabricatorEnv::getURI($uri);
	+ } else {
	+ return PhabricatorEnv::getCDNURI($uri);
	+ }
	}

	}
	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
	@@ -373,7 +373,7 @@
	}

	$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');