From f66edccf6220bcd863691d03eb1a9bb17698d054 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 9 Mar 2015 14:10:34 -0700
Subject: [PATCH] Respect outbound HTTP setting in macro generation

Summary: We respect this when adding inputs to the form, but not when guarding the actual fetch.

Test Plan: Reading

Reviewers: btrahan

Reviewed By: btrahan

Subscribers: epriestley

Differential Revision: https://secure.phabricator.com/D12030
---
 .../macro/controller/PhabricatorMacroEditController.php         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/applications/macro/controller/PhabricatorMacroEditController.php b/src/applications/macro/controller/PhabricatorMacroEditController.php
index 074b7e5a7f..77ca0c7485 100644
--- a/src/applications/macro/controller/PhabricatorMacroEditController.php
+++ b/src/applications/macro/controller/PhabricatorMacroEditController.php
@@ -67,7 +67,7 @@ final class PhabricatorMacroEditController extends PhabricatorMacroController {
             'isExplicitUpload' => true,
             'canCDN' => true,
           ));
-      } else if ($request->getStr('url')) {
+      } else if ($request->getStr('url') && $can_fetch) {
         try {
           $file = PhabricatorFile::newFromFileDownload(
             $request->getStr('url'),