diff options
| author | Thomas Citharel <tcit@tcit.fr> | 2015-01-03 11:38:32 +0100 |
|---|---|---|
| committer | Thomas Citharel <tcit@tcit.fr> | 2015-01-03 11:38:32 +0100 |
| commit | 82978fbd578a13f9e0d19633a5f1162ab2814002 (patch) | |
| tree | 2f332d97d3e8087f13ab479d820e9604ed5d2958 /inc/poche | |
| parent | 92ae99bd29a19ec71c5cc0bf3494aaf0bdaa1f74 (diff) | |
| parent | 1186b3b67ade6a7eece4478a4aa31f809d04e9ce (diff) | |
| download | wallabag-82978fbd578a13f9e0d19633a5f1162ab2814002.tar.gz wallabag-82978fbd578a13f9e0d19633a5f1162ab2814002.tar.zst wallabag-82978fbd578a13f9e0d19633a5f1162ab2814002.zip | |
Merge branch 'master' into dev
To get the errors
Diffstat (limited to 'inc/poche')
| -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) { |