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

[github/wallabag/wallabag.git] / src / Wallabag / CoreBundle / Resources / config / services.yml

diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml
index 1fb81a46104db878fe379695abf846cecb0f3e55..9786ac279d8e5475c4754048fbf51f7a7fd3b3ed 100644 (file)
--- a/src/Wallabag/CoreBundle/Resources/config/services.yml
+++ b/src/Wallabag/CoreBundle/Resources/config/services.yml
@@ -55,6 +55,7 @@ services:
                         '.fok.nl': 'Googlebot/2.1'
                         'getpocket.com': 'PHP/5.2'
                         'iansommerville.com': 'PHP/5.2'
+                        '.slashdot.org': 'PHP/5.2'
         calls:
             - [ setLogger, [ "@logger" ] ]
         tags:
@@ -91,7 +92,7 @@ services:
     wallabag_core.helper.entries_export:
         class: Wallabag\CoreBundle\Helper\EntriesExport
         arguments:
-            - "@craue_config"
+            - '@=service(''craue_config'').get(''wallabag_url'')'
             - src/Wallabag/CoreBundle/Resources/public/themes/_global/img/appicon/apple-touch-icon-152.png
 
     wallabag.operator.array.matches:
@@ -140,17 +141,19 @@ services:
     wallabag_core.subscriber.download_images:
         class: Wallabag\CoreBundle\Event\Subscriber\DownloadImagesSubscriber
         arguments:
+            - "@doctrine.orm.default_entity_manager"
             - "@wallabag_core.entry.download_images"
-            - "%craue_config.config.class%"
+            - '@=service(''craue_config'').get(''download_images_enabled'')'
             - "@logger"
         tags:
-            - { name: doctrine.event_subscriber }
+            - { name: kernel.event_subscriber }
 
     wallabag_core.entry.download_images:
         class: Wallabag\CoreBundle\Helper\DownloadImages
         arguments:
             - "@wallabag_core.entry.download_images.client"
             - "%kernel.root_dir%/../web/assets/images"
+            - '@=service(''craue_config'').get(''wallabag_url'')'
             - "@logger"
 
     wallabag_core.entry.download_images.client: