From c4ee42e6edeedccd63208157c071d4a802842e25 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 25 Feb 2021 19:26:39 +0300 Subject: update for tt-rss core changes --- init.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/init.php b/init.php index 7b17893..e6faed6 100644 --- a/init.php +++ b/init.php @@ -148,7 +148,7 @@ class Data_Migration extends Plugin { $total_processed += count($batch["articles"]); ++$batch_seq; - $zip->addFromString($batch_filename, json_encode($batch, false)); + $zip->addFromString($batch_filename, json_encode($batch)); if (count($batch["articles"]) != $batch_size) break; @@ -166,7 +166,7 @@ class Data_Migration extends Plugin { exit(4); } } - + private function get_export_batch($owner_uid, $offset, $batch_size, $only_marked) { $rv = []; @@ -245,7 +245,7 @@ class Data_Migration extends Plugin { author) VALUES (:title, :guid, :link, :updated, :content, :content_hash, - false, + false, NOW(), NOW(), '', @@ -329,7 +329,7 @@ class Data_Migration extends Plugin { $sth = $this->pdo->prepare( "INSERT INTO ttrss_user_entries - (ref_id, owner_uid, feed_id, unread, last_read, + (ref_id, owner_uid, feed_id, unread, last_read, marked, published, score, tag_cache, label_cache, uuid, note) VALUES (:ref_id, :owner_uid, :feed_id, :unread, NULL, :marked, :published, :score, :tag_cache, '', '', :note)"); @@ -347,7 +347,7 @@ class Data_Migration extends Plugin { if ($res) { - if (DB_TYPE == "pgsql") { + if (Config::get(Config::DB_TYPE) == "pgsql") { $ts_lang = get_pref('DEFAULT_SEARCH_LANGUAGE', $owner_uid); // TODO: maybe use per-feed setting if available? -- cgit v1.2.3