diff options
| author | Thomas Citharel <tcit@tcit.fr> | 2015-02-01 11:33:41 +0100 |
|---|---|---|
| committer | Thomas Citharel <tcit@tcit.fr> | 2015-02-01 11:33:41 +0100 |
| commit | c416cab8c9297d17f073c66d07bafab8b5068db2 (patch) | |
| tree | 5f6342c866127675e3c59e1b664adc257262d86c /inc/poche/Tools.class.php | |
| parent | e51487f93265521cf04d8752b0554bb1f05dd189 (diff) | |
| parent | bc6f5a8086b331bf21cdfcac799788264d8cd3b2 (diff) | |
| download | wallabag-c416cab8c9297d17f073c66d07bafab8b5068db2.tar.gz wallabag-c416cab8c9297d17f073c66d07bafab8b5068db2.tar.zst wallabag-c416cab8c9297d17f073c66d07bafab8b5068db2.zip | |
Merge branch 'dev' into randomarticle
Diffstat (limited to 'inc/poche/Tools.class.php')
| -rwxr-xr-x | inc/poche/Tools.class.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php index f803e3b5..7ccfc069 100755 --- a/inc/poche/Tools.class.php +++ b/inc/poche/Tools.class.php | |||
| @@ -342,7 +342,10 @@ final class Tools | |||
| 342 | return $json; | 342 | return $json; |
| 343 | }; | 343 | }; |
| 344 | 344 | ||
| 345 | $json = $scope("inc/3rdparty/makefulltextfeed.php", array("url" => $url)); | 345 | // Silence $scope function to avoid |
| 346 | // issues with FTRSS when error_reporting is to high | ||
| 347 | // FTRSS generates PHP warnings which break output | ||
| 348 | $json = @$scope("inc/3rdparty/makefulltextfeed.php", array("url" => $url)); | ||
| 346 | 349 | ||
| 347 | // Clearing and restoring context | 350 | // Clearing and restoring context |
| 348 | foreach ($GLOBALS as $key => $value) { | 351 | foreach ($GLOBALS as $key => $value) { |