From 743c1b740bd8ec0b70f7058d4b52101b346a5e9c Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Wed, 16 Jan 2019 22:26:43 +0100 Subject: Export labels (#2217) * Export labels https://github.com/FreshRSS/FreshRSS/issues/2196 * Small fixes * Backport code from 1.14.0 https://github.com/FreshRSS/FreshRSS/pull/2199/commits/4888f919f104b2d170302565e481a0b731eb4145 * More fixes --- cli/export-opml-for-user.php | 2 +- cli/export-zip-for-user.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'cli') 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) { -- cgit v1.2.3