From 04ce14e7a488c4f6277d73f52228f067959c2060 Mon Sep 17 00:00:00 2001
From: megachriz <megachriz@654114.no-reply.drupal.org>
Date: Fri, 10 Apr 2015 15:50:19 -0700
Subject: [PATCH] Issue #2419111 by make77, MegaChriz: Configuration option to
allow invalid SSL certificates is not used when option "Auto detect feeds" is
enabled
---
libraries/http_request.inc | 2 +-
plugins/FeedsHTTPFetcher.inc | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/libraries/http_request.inc b/libraries/http_request.inc
index 852dd4b8..22f4aa07 100644
--- a/libraries/http_request.inc
+++ b/libraries/http_request.inc
@@ -38,7 +38,7 @@ class HRCurlException extends Exception {}
* The discovered feed, or FALSE if the URL is not reachable or there was an
* error.
*/
-function http_request_get_common_syndication($url, $settings = NULL) {
+function http_request_get_common_syndication($url, $settings = array()) {
$accept_invalid_cert = isset($settings['accept_invalid_cert']) ? $settings['accept_invalid_cert'] : FALSE;
$download = http_request_get($url, NULL, NULL, $accept_invalid_cert);
diff --git a/plugins/FeedsHTTPFetcher.inc b/plugins/FeedsHTTPFetcher.inc
index 37611138..cd91b634 100644
--- a/plugins/FeedsHTTPFetcher.inc
+++ b/plugins/FeedsHTTPFetcher.inc
@@ -243,7 +243,10 @@ class FeedsHTTPFetcher extends FeedsFetcher {
}
elseif ($this->config['auto_detect_feeds']) {
feeds_include_library('http_request.inc', 'http_request');
- if ($url = http_request_get_common_syndication($values['source'])) {
+ $url = http_request_get_common_syndication($values['source'], array(
+ 'accept_invalid_cert' => $this->config['accept_invalid_cert'],
+ ));
+ if ($url) {
$values['source'] = $url;
}
}
--
GitLab