diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2017-05-10 19:46:10 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2017-05-10 19:46:10 +0200 |
| commit | e4bc37f9e8e188bf592172221c2bd9bd59564106 (patch) | |
| tree | 1eebfb09332700f7b0728474cca5dd19a0a0fa0c | |
| parent | 83d67bae858a14b0099baff317749b9926c661d3 (diff) | |
| parent | e825822ba0ba686fb3122026a4be8f1510cff8fa (diff) | |
Merge pull request #1528 from cez81/fix_syslog_enabled
Fix syslog_enabled = false not working
| -rw-r--r-- | CREDITS.md | 1 | ||||
| -rw-r--r-- | lib/SimplePie/SimplePie.php | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/CREDITS.md b/CREDITS.md index c3464848c..620131a6d 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -23,6 +23,7 @@ People are sorted by name so please keep this order. * [hckweb](https://github.com/hckweb): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=hckweb) * [Jaussoin Timothée](https://github.com/edhelas): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=edhelas), [Web](http://edhelas.movim.eu/) * [jlefler](https://github.com/jlefler): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:jlefler) +* [Jonas Östanbäck](https://github.com/cez81): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=cez81) * [Julien Reichardt](https://github.com/j8r): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=j8r), [Web](https://blog.jrei.ch/) * [Kevin Papst](https://github.com/kevinpapst): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=kevinpapst), [Web](http://www.kevinpapst.de/) * [Luc Didry](https://github.com/ldidry): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=ldidry), [Web](https://www.fiat-tux.fr/) diff --git a/lib/SimplePie/SimplePie.php b/lib/SimplePie/SimplePie.php index 7240fdf66..ec3ef1c77 100644 --- a/lib/SimplePie/SimplePie.php +++ b/lib/SimplePie/SimplePie.php @@ -1579,7 +1579,7 @@ class SimplePie $headers['if-none-match'] = $this->data['headers']['etag']; } - $file = $this->registry->create('File', array($this->feed_url, $this->timeout, 5, $headers, $this->useragent, $this->force_fsockopen, $this->curl_options)); + $file = $this->registry->create('File', array($this->feed_url, $this->timeout, 5, $headers, $this->useragent, $this->force_fsockopen, $this->curl_options, $this->syslog_enabled)); if ($file->success) { @@ -1633,7 +1633,7 @@ class SimplePie $headers = array( 'Accept' => 'application/atom+xml, application/rss+xml, application/rdf+xml;q=0.9, application/xml;q=0.8, text/xml;q=0.8, text/html;q=0.7, unknown/unknown;q=0.1, application/unknown;q=0.1, */*;q=0.1', ); - $file = $this->registry->create('File', array($this->feed_url, $this->timeout, 5, $headers, $this->useragent, $this->force_fsockopen, $this->curl_options)); + $file = $this->registry->create('File', array($this->feed_url, $this->timeout, 5, $headers, $this->useragent, $this->force_fsockopen, $this->curl_options, $this->syslog_enabled)); } } // If the file connection has an error, set SimplePie::error to that and quit |