diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2016-10-21 15:15:41 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-21 15:15:41 +0200 |
commit | f99ddbc6f82b0e5619d51ec4415738bf34d350b6 (patch) | |
tree | 1aab7d493dcb8fe79f19d612ef62f7d8e58f597f /src/Wallabag/ImportBundle/Import/BrowserImport.php | |
parent | 49dee2d2de63af36248e92ce740da2692358280e (diff) | |
parent | b64d8f2c9f4092b43da5f4a978028d80d9ee81a8 (diff) | |
download | wallabag-f99ddbc6f82b0e5619d51ec4415738bf34d350b6.tar.gz wallabag-f99ddbc6f82b0e5619d51ec4415738bf34d350b6.tar.zst wallabag-f99ddbc6f82b0e5619d51ec4415738bf34d350b6.zip |
Merge pull request #2481 from wallabag/some-fixes
Some fixes
Diffstat (limited to 'src/Wallabag/ImportBundle/Import/BrowserImport.php')
-rw-r--r-- | src/Wallabag/ImportBundle/Import/BrowserImport.php | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/Wallabag/ImportBundle/Import/BrowserImport.php b/src/Wallabag/ImportBundle/Import/BrowserImport.php index 9d75685b..2ca1683b 100644 --- a/src/Wallabag/ImportBundle/Import/BrowserImport.php +++ b/src/Wallabag/ImportBundle/Import/BrowserImport.php | |||
@@ -139,12 +139,24 @@ abstract class BrowserImport extends AbstractImport | |||
139 | public function parseEntry(array $importedEntry) | 139 | public function parseEntry(array $importedEntry) |
140 | { | 140 | { |
141 | if ((!array_key_exists('guid', $importedEntry) || (!array_key_exists('id', $importedEntry))) && is_array(reset($importedEntry))) { | 141 | if ((!array_key_exists('guid', $importedEntry) || (!array_key_exists('id', $importedEntry))) && is_array(reset($importedEntry))) { |
142 | if ($this->producer) { | ||
143 | $this->parseEntriesForProducer($importedEntry); | ||
144 | |||
145 | return; | ||
146 | } | ||
147 | |||
142 | $this->parseEntries($importedEntry); | 148 | $this->parseEntries($importedEntry); |
143 | 149 | ||
144 | return; | 150 | return; |
145 | } | 151 | } |
146 | 152 | ||
147 | if (array_key_exists('children', $importedEntry)) { | 153 | if (array_key_exists('children', $importedEntry)) { |
154 | if ($this->producer) { | ||
155 | $this->parseEntriesForProducer($importedEntry['children']); | ||
156 | |||
157 | return; | ||
158 | } | ||
159 | |||
148 | $this->parseEntries($importedEntry['children']); | 160 | $this->parseEntries($importedEntry['children']); |
149 | 161 | ||
150 | return; | 162 | return; |