summaryrefslogtreecommitdiff
path: root/inc/FeedParser.php
diff options
context:
space:
mode:
authorKate Arzamastseva <pshns@ukr.net>2011-06-28 15:54:18 +0300
committerKate Arzamastseva <pshns@ukr.net>2011-06-28 15:54:18 +0300
commite18ba5797b635bf97755910093c3eed1f9667362 (patch)
treecf6fd41758cf814d96222d74a37def8787f888be /inc/FeedParser.php
parent322111f0870d88a59b71258ce8410ae378441533 (diff)
parenta4f16859d7e91bb129edd3be5c62177d56030981 (diff)
downloadrpg-e18ba5797b635bf97755910093c3eed1f9667362.tar.gz
rpg-e18ba5797b635bf97755910093c3eed1f9667362.tar.bz2
Merge branch 'master' of git://github.com/splitbrain/dokuwiki into media-revisions
Diffstat (limited to 'inc/FeedParser.php')
-rw-r--r--inc/FeedParser.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/inc/FeedParser.php b/inc/FeedParser.php
index b98350da7..235bed46e 100644
--- a/inc/FeedParser.php
+++ b/inc/FeedParser.php
@@ -49,7 +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();
+ @parent::__construct();
$this->http = new DokuHTTPClient();
$this->success = $this->http->sendRequest($url);