aboutsummaryrefslogtreecommitdiffhomepage
path: root/inc/poche
diff options
context:
space:
mode:
authorThomas Citharel <tcit@tcit.fr>2014-12-26 10:31:15 +0100
committerThomas Citharel <tcit@tcit.fr>2014-12-26 10:31:15 +0100
commit1aa1461a2e26d6270956d492f617c51aa97a426c (patch)
tree85b2e98b8d380a7afc0764ffabc55cf075130e4a /inc/poche
parenta460404252590d2c31d93c41b5031bb6c5add98f (diff)
parent81315897f088105b445c194e7a984662bb208854 (diff)
downloadwallabag-1aa1461a2e26d6270956d492f617c51aa97a426c.tar.gz
wallabag-1aa1461a2e26d6270956d492f617c51aa97a426c.tar.zst
wallabag-1aa1461a2e26d6270956d492f617c51aa97a426c.zip
Merge pull request #974 from jbfavre/fix_ftrss_call_can_break_import
Make call to FTRSS silent to avoid warnings which can break import
Diffstat (limited to 'inc/poche')
-rwxr-xr-xinc/poche/Tools.class.php5
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) {