aboutsummaryrefslogtreecommitdiff
path: root/app/Controllers/feedController.php
diff options
context:
space:
mode:
authorGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2014-03-28 22:13:42 +0100
committerGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2014-03-28 22:13:42 +0100
commitd464833922e9cc00948698aed0a2af1f0b55e101 (patch)
treeb3d8b618601ada9cdf0f4073aa7fa864fd2f3b55 /app/Controllers/feedController.php
parent05cc97a8f43d779fbea52f5ef47fe6a71c3ab692 (diff)
Improve import / export functionnality
It is not finished yet and does not even work at all!! - ZIP archive can be uploaded - Entries are imported from starred.json and feed*.json but not added in DB for the moment. - Fix export (add author, id -> guid, content -> content.content and add alternate) See https://github.com/marienfressinaud/FreshRSS/issues/163
Diffstat (limited to 'app/Controllers/feedController.php')
-rwxr-xr-xapp/Controllers/feedController.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 16516ad39..43435d99d 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -328,6 +328,8 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
}
public function massiveImportAction () {
+ # TODO: this function has moved to importExportController.php
+ # I keep it for the moment but should be deleted in a near future.
@set_time_limit(300);
$this->catDAO = new FreshRSS_CategoryDAO ();