Merge pull request #974 from jbfavre/fix_ftrss_call_can_break_import

Make call to FTRSS silent to avoid warnings which can break import

diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php
index f803e3b57b1435e6064cefea5e9e48e08b6672ee..7ccfc069b16bb5094be623003198f5f7ecbabd10 100755 (executable)
--- a/inc/poche/Tools.class.php
+++ b/inc/poche/Tools.class.php
@@ -342,7 +342,10 @@ final class Tools
             return $json;
         };
 
-        $json = $scope("inc/3rdparty/makefulltextfeed.php", array("url" => $url));
+       // Silence $scope function to avoid
+       // issues with FTRSS when error_reporting is to high
+       // FTRSS generates PHP warnings which break output
+        $json = @$scope("inc/3rdparty/makefulltextfeed.php", array("url" => $url));
 
         // Clearing and restoring context
         foreach ($GLOBALS as $key => $value) {