aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--CREDITS.md3
-rwxr-xr-xinc/poche/Tools.class.php5
-rw-r--r--locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po2
3 files changed, 7 insertions, 3 deletions
diff --git a/CREDITS.md b/CREDITS.md
index f1e9d7af..e76c580d 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -8,9 +8,10 @@ wallabag is based on :
8* Twig http://twig.sensiolabs.org 8* Twig http://twig.sensiolabs.org
9* Flash messages https://github.com/plasticbrain/PHP-Flash-Messages 9* Flash messages https://github.com/plasticbrain/PHP-Flash-Messages
10* Pagination https://github.com/daveismyname/pagination 10* Pagination https://github.com/daveismyname/pagination
11* PHPePub https://github.com/Grandt/PHPePub/
11 12
12wallabag is mainly developed by Nicolas Lœuillet under the MIT License 13wallabag is mainly developed by Nicolas Lœuillet under the MIT License
13 14
14Thank you so much to @tcitworld and @mariroz. 15Thank you so much to @tcitworld and @mariroz.
15 16
16Contributors : https://github.com/wallabag/wallabag/graphs/contributors \ No newline at end of file 17Contributors : https://github.com/wallabag/wallabag/graphs/contributors
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) {
diff --git a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po
index 4bdb3cd5..fef31208 100644
--- a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po
+++ b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po
@@ -250,7 +250,7 @@ msgid ""
250"your config file: IMPORT_LIMIT (how many articles are fetched at once) and " 250"your config file: IMPORT_LIMIT (how many articles are fetched at once) and "
251"IMPORT_DELAY (delay between fetch of next batch of articles)." 251"IMPORT_DELAY (delay between fetch of next batch of articles)."
252msgstr "" 252msgstr ""
253"Sélectionner le fichier à importer sur votre disque dur, et pressez la " 253"Sélectionnez le fichier à importer sur votre disque dur, et pressez la "
254"bouton « Importer » ci-dessous.<br />wallabag analysera votre fichier, " 254"bouton « Importer » ci-dessous.<br />wallabag analysera votre fichier, "
255"ajoutera toutes les URL trouvées et commencera à télécharger les contenus si " 255"ajoutera toutes les URL trouvées et commencera à télécharger les contenus si "
256"nécessaire.<br />Le processus de téléchargement est contrôlé par deux " 256"nécessaire.<br />Le processus de téléchargement est contrôlé par deux "