aboutsummaryrefslogtreecommitdiff
path: root/app/Controllers/importExportController.php
diff options
context:
space:
mode:
Diffstat (limited to 'app/Controllers/importExportController.php')
-rw-r--r--app/Controllers/importExportController.php8
1 files changed, 6 insertions, 2 deletions
diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php
index 8b2b9cf27..c7b2d579f 100644
--- a/app/Controllers/importExportController.php
+++ b/app/Controllers/importExportController.php
@@ -5,7 +5,10 @@
*/
class FreshRSS_importExport_Controller extends FreshRSS_ActionController {
+ /** @var FreshRSS_EntryDAO */
private $entryDAO;
+
+ /** @var FreshRSS_FeedDAO */
private $feedDAO;
/**
@@ -96,7 +99,8 @@ class FreshRSS_importExport_Controller extends FreshRSS_ActionController {
$importService = new FreshRSS_Import_Service($username);
foreach ($list_files['opml'] as $opml_file) {
- if (!$importService->importOpml($opml_file)) {
+ $importService->importOpml($opml_file);
+ if (!$importService->lastStatus()) {
$ok = false;
if (FreshRSS_Context::$isCli) {
fwrite(STDERR, 'FreshRSS error during OPML import' . "\n");
@@ -520,7 +524,7 @@ class FreshRSS_importExport_Controller extends FreshRSS_ActionController {
$feed->_name($name);
$feed->_website($website);
if (!empty($origin['disable'])) {
- $feed->_ttl(-1 * FreshRSS_Context::$user_conf->ttl_default);
+ $feed->_mute(true);
}
// Call the extension hook