mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-01-05 14:28:40 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2688 from wallabag/fix-browsers-import

Browse source 
Fixed imports with is_starred and is_archived
This commit is contained in:
Nicolas Lœuillet 2016-12-08 09:07:09 +01:00 committed by GitHub
commit 75ae3c8d82
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Wallabag/ImportBundle/Import/ChromeImport.php
View file

@ -39,7 +39,8 @@ class ChromeImport extends BrowserImport
'title' => $entry['name'], 'title' => $entry['name'],
'html' => false, 'html' => false,
'url' => $entry['url'], 'url' => $entry['url'],
'is_archived' => $this->markAsRead, 'is_archived' => (int) $this->markAsRead,
'is_starred' => false,
'tags' => '', 'tags' => '',
'created_at' => substr($entry['date_added'], 0, 10), 'created_at' => substr($entry['date_added'], 0, 10),
]; ];

3
src/Wallabag/ImportBundle/Import/FirefoxImport.php
View file

@ -39,7 +39,8 @@ class FirefoxImport extends BrowserImport
'title' => $entry['title'], 'title' => $entry['title'],
'html' => false, 'html' => false,
'url' => $entry['uri'], 'url' => $entry['uri'],
'is_archived' => $this->markAsRead, 'is_archived' => (int) $this->markAsRead,
'is_starred' => false,
'tags' => '', 'tags' => '',
'created_at' => substr($entry['dateAdded'], 0, 10), 'created_at' => substr($entry['dateAdded'], 0, 10),
]; ];

3
src/Wallabag/ImportBundle/Import/WallabagV2Import.php
View file

@ -36,7 +36,8 @@ class WallabagV2Import extends WallabagImport
return [ return [
'html' => $entry['content'], 'html' => $entry['content'],
'content_type' => $entry['mimetype'], 'content_type' => $entry['mimetype'],
'is_archived' => ($entry['is_archived'] || $this->markAsRead), 'is_archived' => (int) ($entry['is_archived'] || $this->markAsRead),
'is_starred' => false,
] + $entry; ] + $entry;
} }