+1

src/__phutil_library_map__.php

reviewed

··· 4381 4381 'PhabricatorSubscribableInterface', 4382 4382 'PhabricatorFlaggableInterface', 4383 4383 'PhabricatorPolicyInterface', 4384 4384 + 'PhabricatorDestructibleInterface', 4384 4385 ), 4385 4386 'PhabricatorFileCommentController' => 'PhabricatorFileController', 4386 4387 'PhabricatorFileComposeController' => 'PhabricatorFileController',

+1 -2

src/applications/differential/controller/DifferentialChangesetViewController.php

reviewed

··· 347 347 unset($unguard); 348 348 } 349 349 350 350 - return id(new AphrontRedirectResponse()) 351 351 - ->setURI($file->getBestURI()); 350 350 + return $file->getRedirectResponse(); 352 351 } 353 352 354 353 private function buildLintInlineComments($changeset) {

+1 -1

src/applications/differential/controller/DifferentialRevisionViewController.php

reviewed

··· 918 918 $revision->getPHID()); 919 919 unset($unguarded); 920 920 921 921 - return id(new AphrontRedirectResponse())->setURI($file->getBestURI()); 921 921 + return $file->getRedirectResponse(); 922 922 } 923 923 924 924 private function buildTransactions(

+1 -1

src/applications/diffusion/controller/DiffusionBrowseFileController.php

reviewed

··· 887 887 888 888 private function buildRawResponse($path, $data) { 889 889 $file = $this->loadFileForData($path, $data); 890 890 - return id(new AphrontRedirectResponse())->setURI($file->getBestURI()); 890 890 + return $file->getRedirectResponse(); 891 891 } 892 892 893 893 private function buildImageCorpus($file_uri) {

+1 -1

src/applications/diffusion/controller/DiffusionCommitController.php

reviewed

··· 1042 1042 $drequest->getRepository()->getPHID()); 1043 1043 unset($unguarded); 1044 1044 1045 1045 - return id(new AphrontRedirectResponse())->setURI($file->getBestURI()); 1045 1045 + return $file->getRedirectResponse(); 1046 1046 } 1047 1047 1048 1048 private function renderAuditStatusView(array $audit_requests) {

+1 -15

src/applications/files/controller/PhabricatorFileTransformController.php

reviewed

··· 148 148 149 149 // TODO: We could just delegate to the file view controller instead, 150 150 // which would save the client a roundtrip, but is slightly more complex. 151 151 - $uri = $file->getBestURI(); 152 151 153 153 - // TODO: This is a bit iffy. Sometimes, getBestURI() returns a CDN URI 154 154 - // (if the file is a viewable image) and sometimes a local URI (if not). 155 155 - // For now, just detect which one we got and configure the response 156 156 - // appropriately. In the long run, if this endpoint is served from a CDN 157 157 - // domain, we can't issue a local redirect to an info URI (which is not 158 158 - // present on the CDN domain). We probably never actually issue local 159 159 - // redirects here anyway, since we only ever transform viewable images 160 160 - // right now. 161 161 - 162 162 - $is_external = strlen(id(new PhutilURI($uri))->getDomain()); 163 163 - 164 164 - return id(new AphrontRedirectResponse()) 165 165 - ->setIsExternal($is_external) 166 166 - ->setURI($uri); 152 152 + return $file->getRedirectResponse(); 167 153 } 168 154 169 155 private function executePreviewTransform(PhabricatorFile $file, $size) {

+19

src/applications/files/storage/PhabricatorFile.php

reviewed

··· 967 967 return $this; 968 968 } 969 969 970 970 + public function getRedirectResponse() { 971 971 + $uri = $this->getBestURI(); 972 972 + 973 973 + // TODO: This is a bit iffy. Sometimes, getBestURI() returns a CDN URI 974 974 + // (if the file is a viewable image) and sometimes a local URI (if not). 975 975 + // For now, just detect which one we got and configure the response 976 976 + // appropriately. In the long run, if this endpoint is served from a CDN 977 977 + // domain, we can't issue a local redirect to an info URI (which is not 978 978 + // present on the CDN domain). We probably never actually issue local 979 979 + // redirects here anyway, since we only ever transform viewable images 980 980 + // right now. 981 981 + 982 982 + $is_external = strlen(id(new PhutilURI($uri))->getDomain()); 983 983 + 984 984 + return id(new AphrontRedirectResponse()) 985 985 + ->setIsExternal($is_external) 986 986 + ->setURI($uri); 987 987 + } 988 988 + 970 989 971 990 /* -( PhabricatorPolicyInterface Implementation )-------------------------- */ 972 991