diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2016-09-11 18:48:36 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-11 18:48:36 +0200 |
commit | 59758d8fe5ad5ff554391515a78d84b0d47bdb76 (patch) | |
tree | 43054fdd7f15e11d681970dfb692b269fbf6b705 /src/Wallabag | |
parent | c078d18372e05b09b40c34f67b7cb81446f30c4f (diff) | |
parent | 88e88016b9a86d76940082b62c85c3756f461cb2 (diff) | |
download | wallabag-59758d8fe5ad5ff554391515a78d84b0d47bdb76.tar.gz wallabag-59758d8fe5ad5ff554391515a78d84b0d47bdb76.tar.zst wallabag-59758d8fe5ad5ff554391515a78d84b0d47bdb76.zip |
Merge pull request #2279 from wallabag/cleanup-travis
Check if asset is enable instead of opposite
Diffstat (limited to 'src/Wallabag')
-rw-r--r-- | src/Wallabag/ImportBundle/Import/PocketImport.php | 2 | ||||
-rw-r--r-- | src/Wallabag/ImportBundle/Import/ReadabilityImport.php | 2 | ||||
-rw-r--r-- | src/Wallabag/ImportBundle/Import/WallabagImport.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/Wallabag/ImportBundle/Import/PocketImport.php b/src/Wallabag/ImportBundle/Import/PocketImport.php index 798cfdae..a6f905b1 100644 --- a/src/Wallabag/ImportBundle/Import/PocketImport.php +++ b/src/Wallabag/ImportBundle/Import/PocketImport.php | |||
@@ -255,11 +255,11 @@ class PocketImport extends AbstractImport | |||
255 | // flush every 20 entries | 255 | // flush every 20 entries |
256 | if (($i % 20) === 0) { | 256 | if (($i % 20) === 0) { |
257 | $this->em->flush(); | 257 | $this->em->flush(); |
258 | $this->em->clear($entry); | ||
259 | } | 258 | } |
260 | ++$i; | 259 | ++$i; |
261 | } | 260 | } |
262 | 261 | ||
263 | $this->em->flush(); | 262 | $this->em->flush(); |
263 | $this->em->clear(); | ||
264 | } | 264 | } |
265 | } | 265 | } |
diff --git a/src/Wallabag/ImportBundle/Import/ReadabilityImport.php b/src/Wallabag/ImportBundle/Import/ReadabilityImport.php index 37b160c5..c7cfe15d 100644 --- a/src/Wallabag/ImportBundle/Import/ReadabilityImport.php +++ b/src/Wallabag/ImportBundle/Import/ReadabilityImport.php | |||
@@ -169,11 +169,11 @@ class ReadabilityImport extends AbstractImport | |||
169 | // flush every 20 entries | 169 | // flush every 20 entries |
170 | if (($i % 20) === 0) { | 170 | if (($i % 20) === 0) { |
171 | $this->em->flush(); | 171 | $this->em->flush(); |
172 | $this->em->clear($entry); | ||
173 | } | 172 | } |
174 | ++$i; | 173 | ++$i; |
175 | } | 174 | } |
176 | 175 | ||
177 | $this->em->flush(); | 176 | $this->em->flush(); |
177 | $this->em->clear(); | ||
178 | } | 178 | } |
179 | } | 179 | } |
diff --git a/src/Wallabag/ImportBundle/Import/WallabagImport.php b/src/Wallabag/ImportBundle/Import/WallabagImport.php index a1cc085b..581ec178 100644 --- a/src/Wallabag/ImportBundle/Import/WallabagImport.php +++ b/src/Wallabag/ImportBundle/Import/WallabagImport.php | |||
@@ -172,12 +172,12 @@ abstract class WallabagImport extends AbstractImport | |||
172 | // flush every 20 entries | 172 | // flush every 20 entries |
173 | if (($i % 20) === 0) { | 173 | if (($i % 20) === 0) { |
174 | $this->em->flush(); | 174 | $this->em->flush(); |
175 | $this->em->clear($entry); | ||
176 | } | 175 | } |
177 | ++$i; | 176 | ++$i; |
178 | } | 177 | } |
179 | 178 | ||
180 | $this->em->flush(); | 179 | $this->em->flush(); |
180 | $this->em->clear(); | ||
181 | } | 181 | } |
182 | 182 | ||
183 | /** | 183 | /** |