diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2016-12-07 16:01:50 +0100 |
---|---|---|
committer | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2016-12-07 16:01:50 +0100 |
commit | bb98fede2b7c3e6eba8d47b2ce560d824d166b49 (patch) | |
tree | 9bb4ee70f9dc3de4a5b4e3062f18ebd5c8f0eae4 | |
parent | 2d4b167038ed9e25ebf23eed53a4bc88f17a4b00 (diff) | |
download | wallabag-bb98fede2b7c3e6eba8d47b2ce560d824d166b49.tar.gz wallabag-bb98fede2b7c3e6eba8d47b2ce560d824d166b49.tar.zst wallabag-bb98fede2b7c3e6eba8d47b2ce560d824d166b49.zip |
Fixed imports with is_starred and is_archived
-rw-r--r-- | src/Wallabag/ImportBundle/Import/ChromeImport.php | 3 | ||||
-rw-r--r-- | src/Wallabag/ImportBundle/Import/FirefoxImport.php | 3 | ||||
-rw-r--r-- | src/Wallabag/ImportBundle/Import/WallabagV2Import.php | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/Wallabag/ImportBundle/Import/ChromeImport.php b/src/Wallabag/ImportBundle/Import/ChromeImport.php index 1a324934..2667890f 100644 --- a/src/Wallabag/ImportBundle/Import/ChromeImport.php +++ b/src/Wallabag/ImportBundle/Import/ChromeImport.php | |||
@@ -39,7 +39,8 @@ class ChromeImport extends BrowserImport | |||
39 | 'title' => $entry['name'], | 39 | 'title' => $entry['name'], |
40 | 'html' => false, | 40 | 'html' => false, |
41 | 'url' => $entry['url'], | 41 | 'url' => $entry['url'], |
42 | 'is_archived' => $this->markAsRead, | 42 | 'is_archived' => (int) $this->markAsRead, |
43 | 'is_starred' => false, | ||
43 | 'tags' => '', | 44 | 'tags' => '', |
44 | 'created_at' => substr($entry['date_added'], 0, 10), | 45 | 'created_at' => substr($entry['date_added'], 0, 10), |
45 | ]; | 46 | ]; |
diff --git a/src/Wallabag/ImportBundle/Import/FirefoxImport.php b/src/Wallabag/ImportBundle/Import/FirefoxImport.php index d3f99770..c50c69b3 100644 --- a/src/Wallabag/ImportBundle/Import/FirefoxImport.php +++ b/src/Wallabag/ImportBundle/Import/FirefoxImport.php | |||
@@ -39,7 +39,8 @@ class FirefoxImport extends BrowserImport | |||
39 | 'title' => $entry['title'], | 39 | 'title' => $entry['title'], |
40 | 'html' => false, | 40 | 'html' => false, |
41 | 'url' => $entry['uri'], | 41 | 'url' => $entry['uri'], |
42 | 'is_archived' => $this->markAsRead, | 42 | 'is_archived' => (int) $this->markAsRead, |
43 | 'is_starred' => false, | ||
43 | 'tags' => '', | 44 | 'tags' => '', |
44 | 'created_at' => substr($entry['dateAdded'], 0, 10), | 45 | 'created_at' => substr($entry['dateAdded'], 0, 10), |
45 | ]; | 46 | ]; |
diff --git a/src/Wallabag/ImportBundle/Import/WallabagV2Import.php b/src/Wallabag/ImportBundle/Import/WallabagV2Import.php index 37c8ca14..d2a89d79 100644 --- a/src/Wallabag/ImportBundle/Import/WallabagV2Import.php +++ b/src/Wallabag/ImportBundle/Import/WallabagV2Import.php | |||
@@ -36,7 +36,8 @@ class WallabagV2Import extends WallabagImport | |||
36 | return [ | 36 | return [ |
37 | 'html' => $entry['content'], | 37 | 'html' => $entry['content'], |
38 | 'content_type' => $entry['mimetype'], | 38 | 'content_type' => $entry['mimetype'], |
39 | 'is_archived' => ($entry['is_archived'] || $this->markAsRead), | 39 | 'is_archived' => (int) ($entry['is_archived'] || $this->markAsRead), |
40 | 'is_starred' => false, | ||
40 | ] + $entry; | 41 | ] + $entry; |
41 | } | 42 | } |
42 | 43 | ||