diff options
| author | Adrian Lang <mail@adrianlang.de> | 2011-04-22 22:35:43 +0200 |
|---|---|---|
| committer | Adrian Lang <mail@adrianlang.de> | 2011-04-22 22:35:43 +0200 |
| commit | 8ccf9c9785ec2b626bad30a88a21f02886845418 (patch) | |
| tree | 0ecd6103880e3350bd37ba11ae3872805ede1755 /inc/FeedParser.php | |
| parent | e2092379b1c3200832cb569781ec647db5aeef0f (diff) | |
| parent | 23d27376b2a2f6a1ccf0777c48435717494d85b1 (diff) | |
| download | rpg-8ccf9c9785ec2b626bad30a88a21f02886845418.tar.gz rpg-8ccf9c9785ec2b626bad30a88a21f02886845418.tar.bz2 | |
Merge branch 'master' into stable
Conflicts:
data/deleted.files
doku.php
lib/exe/xmlrpc.php
Diffstat (limited to 'inc/FeedParser.php')
| -rw-r--r-- | inc/FeedParser.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/inc/FeedParser.php b/inc/FeedParser.php index 9d00e7abf..b98350da7 100644 --- a/inc/FeedParser.php +++ b/inc/FeedParser.php @@ -49,6 +49,7 @@ class FeedParser_File extends SimplePie_File { */ function FeedParser_File($url, $timeout=10, $redirects=5, $headers=null, $useragent=null, $force_fsockopen=false) { + parent::__construct(); $this->http = new DokuHTTPClient(); $this->success = $this->http->sendRequest($url); |