Merge branch 'master' into dev

To get the errors
This commit is contained in:
Thomas Citharel 2015-01-03 11:38:32 +01:00
commit 82978fbd57
3 changed files with 7 additions and 3 deletions

View file

@ -8,9 +8,10 @@ wallabag is based on :
* Twig http://twig.sensiolabs.org
* Flash messages https://github.com/plasticbrain/PHP-Flash-Messages
* Pagination https://github.com/daveismyname/pagination
* PHPePub https://github.com/Grandt/PHPePub/
wallabag is mainly developed by Nicolas Lœuillet under the MIT License
Thank you so much to @tcitworld and @mariroz.
Contributors : https://github.com/wallabag/wallabag/graphs/contributors
Contributors : https://github.com/wallabag/wallabag/graphs/contributors

View file

@ -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) {

View file

@ -250,7 +250,7 @@ msgid ""
"your config file: IMPORT_LIMIT (how many articles are fetched at once) and "
"IMPORT_DELAY (delay between fetch of next batch of articles)."
msgstr ""
"Sélectionner le fichier à importer sur votre disque dur, et pressez la "
"Sélectionnez le fichier à importer sur votre disque dur, et pressez la "
"bouton « Importer » ci-dessous.<br />wallabag analysera votre fichier, "
"ajoutera toutes les URL trouvées et commencera à télécharger les contenus si "
"nécessaire.<br />Le processus de téléchargement est contrôlé par deux "