diff options
| author | 2014-08-09 00:23:22 +0200 | |
|---|---|---|
| committer | 2014-08-09 00:23:22 +0200 | |
| commit | d007b22beb701b78968db420c3be6336ee98a350 (patch) | |
| tree | 6dbb310943f00cba86f3d3cea44d19036e0b193b /app/Controllers/importExportController.php | |
| parent | fda8eba4d147a7624f64c03001df1d317804c0d4 (diff) | |
Change view import/export if no zip extension
Show a select with only one choice is there is no zip extension on
the server.
Fix typo.
See https://github.com/marienfressinaud/FreshRSS/issues/494
Diffstat (limited to 'app/Controllers/importExportController.php')
| -rw-r--r-- | app/Controllers/importExportController.php | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php index ba4ca4eb0..2b3353d93 100644 --- a/app/Controllers/importExportController.php +++ b/app/Controllers/importExportController.php @@ -329,11 +329,13 @@ class FreshRSS_importExport_Controller extends Minz_ActionController { foreach ($export_feeds as $feed_id) { $feed = $this->feedDAO->searchById($feed_id); - $filename = 'feed_' . $feed->category() . '_' - . $feed->id() . '.json'; - $export_files[$filename] = $this->generateArticles( - 'feed', $feed - ); + if ($feed) { + $filename = 'feed_' . $feed->category() . '_' + . $feed->id() . '.json'; + $export_files[$filename] = $this->generateArticles( + 'feed', $feed + ); + } } $nb_files = count($export_files); |
