diff options
author | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-10-08 13:41:53 +0200 |
---|---|---|
committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-10-08 13:41:53 +0200 |
commit | 2c07af4842fa69d95070e2a9676c5d4306cf3d86 (patch) | |
tree | 245da6c261b892ccf597f7daa8bf89f8f7268f9f /utility | |
parent | 323dab9b9cd4e013d9a806e3169cc5996f5c4c78 (diff) |
remove dead proxy code from favicon fetcher
Diffstat (limited to 'utility')
-rw-r--r-- | utility/faviconfetcher.php | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/utility/faviconfetcher.php b/utility/faviconfetcher.php index cadc90210..7ffdad9d7 100644 --- a/utility/faviconfetcher.php +++ b/utility/faviconfetcher.php @@ -19,16 +19,14 @@ use \ZendXml\Security; class FaviconFetcher { private $apiFactory; - private $config; /** * Inject a factory to build a simplepie file object. This is needed because * the file object contains logic in its constructor which makes it * impossible to inject and test */ - public function __construct(SimplePieAPIFactory $apiFactory, Config $config) { + public function __construct(SimplePieAPIFactory $apiFactory) { $this->apiFactory = $apiFactory; - $this->config = $config; } @@ -102,15 +100,8 @@ class FaviconFetcher { private function getFile($url) { - if(trim($this->config->getProxyHost()) === '') { - return $this->apiFactory->getFile($url, 10, 5, null, null, false, + return $this->apiFactory->getFile($url, 10, 5, null, null, false, null, null, null); - } else { - return $this->apiFactory->getFile($url, 10, 5, null, null, false, - $this->config->getProxyHost(), - $this->config->getProxyPort(), - $this->config->getProxyAuth()); - } } |