diff --git a/resources/chatbot/example_config.json b/resources/chatbot/example_config.json deleted file mode 100644 index 7d150e65ae..0000000000 --- a/resources/chatbot/example_config.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "server" : "irc.freenode.net", - "port" : 6667, - "nick" : "phabot", - "join" : [ - "#phabot-test" - ], - "handlers" : [ - "PhabricatorBotObjectNameHandler", - "PhabricatorBotSymbolHandler", - "PhabricatorBotLogHandler", - "PhabricatorBotFeedNotificationHandler", - "PhabricatorBotWhatsNewHandler", - "PhabricatorBotMacroHandler" - ], - - "conduit.uri" : null, - "conduit.token" : null, - - "macro.size" : 48, - "macro.aspect" : 0.66, - - "notification.channels" : ["#phabot-test"] -} diff --git a/src/applications/files/storage/PhabricatorFile.php b/src/applications/files/storage/PhabricatorFile.php index 19f0bed90a..97c2ef6acc 100644 --- a/src/applications/files/storage/PhabricatorFile.php +++ b/src/applications/files/storage/PhabricatorFile.php @@ -854,7 +854,7 @@ final class PhabricatorFile extends PhabricatorFileDAO return $this->getTransformedURI($transform->getTransformKey()); } - private function getTransformedURI($transform) { + private function getTransformedURI($transform, $cdn) { $parts = array(); $parts[] = 'file'; $parts[] = 'xform'; @@ -871,7 +871,11 @@ final class PhabricatorFile extends PhabricatorFileDAO $path = implode('/', $parts); $path = $path.'/'; - return PhabricatorEnv::getCDNURI($path); + if ($cdn) { + return PhabricatorEnv::getCDNURI($path); + } else { + return PhabricatorEnv::getURI($path); + } } public function isViewableInBrowser() {