summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2021-02-25 19:26:39 +0300
committerAndrew Dolgov <[email protected]>2021-02-25 19:26:39 +0300
commitc4ee42e6edeedccd63208157c071d4a802842e25 (patch)
treefa4e8f1861fd6aa6882d1f55aa6e39f92e730538
parent7ad00753039640d22bedde34b74483d2ef1a3c90 (diff)
update for tt-rss core changes
-rw-r--r--init.php10
1 files 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?