Merge remote-tracking branch 'origin/master' into 2.1

[github/wallabag/wallabag.git] / src / Wallabag / CoreBundle / DataFixtures / ORM / LoadSettingData.php

diff --git a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php
index 0905879616e06afa13b302c62df918dfcc8c47c6..9425f961fd9668fa7fc47029405e5fd8eb920607 100644 (file)
--- a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php
+++ b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php
@@ -15,6 +15,11 @@ class LoadSettingData extends AbstractFixture implements OrderedFixtureInterface
     public function load(ObjectManager $manager)
     {
         $settings = [
+            [
+                'name' => 'share_public',
+                'value' => '1',
+                'section' => 'entry',
+            ],
             [
                 'name' => 'carrot',
                 'value' => '1',
@@ -86,8 +91,13 @@ class LoadSettingData extends AbstractFixture implements OrderedFixtureInterface
                 'section' => 'export',
             ],
             [
-                'name' => 'pocket_consumer_key',
-                'value' => null,
+                'name' => 'import_with_redis',
+                'value' => '0',
+                'section' => 'import',
+            ],
+            [
+                'name' => 'import_with_rabbitmq',
+                'value' => '0',
                 'section' => 'import',
             ],
             [