diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2019-01-17 21:36:29 +0100 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2019-01-17 21:36:29 +0100 |
| commit | 34fe41ac78b6bd465c12086edbbd856d9533065c (patch) | |
| tree | 12e86c946a9a76aa83af0f1f8ff315368e08535c /cli | |
| parent | 6bc49e137e2f996f768770c3702d7d6552f556b3 (diff) | |
| parent | 48c901bc5c090ff0ee8397d0b1ecfb337d774a86 (diff) | |
Merge branch 'FreshRSS/dev' into FreshRSS/dev-1.14.0
Diffstat (limited to 'cli')
| -rwxr-xr-x | cli/export-opml-for-user.php | 2 | ||||
| -rwxr-xr-x | cli/export-zip-for-user.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cli/export-opml-for-user.php b/cli/export-opml-for-user.php index fd0993c35..076cffe74 100755 --- a/cli/export-opml-for-user.php +++ b/cli/export-opml-for-user.php @@ -17,7 +17,7 @@ fwrite(STDERR, 'FreshRSS exporting OPML for user “' . $username . "”…\n"); $importController = new FreshRSS_importExport_Controller(); $ok = false; -$ok = $importController->exportFile(true, false, array(), 0, $username); +$ok = $importController->exportFile(true, false, false, array(), 0, $username); invalidateHttpCache($username); diff --git a/cli/export-zip-for-user.php b/cli/export-zip-for-user.php index 916ecbb45..86113d9fa 100755 --- a/cli/export-zip-for-user.php +++ b/cli/export-zip-for-user.php @@ -19,7 +19,7 @@ $importController = new FreshRSS_importExport_Controller(); $ok = false; try { - $ok = $importController->exportFile(true, true, true, + $ok = $importController->exportFile(true, true, true, true, empty($options['max-feed-entries']) ? 100 : intval($options['max-feed-entries']), $username); } catch (FreshRSS_ZipMissing_Exception $zme) { |