From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Mon, 22 Feb 2016 09:58:43 +0000 (+0100)
Subject: Use a different way to use piwik
X-Git-Tag: 2.0.0-beta.1~19^2
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=077ddbe1aef64326f39e5e9a9f27517dd8d6ea44;p=github%2Fwallabag%2Fwallabag.git

Use a different way to use piwik
---

diff --git a/app/config/services.yml b/app/config/services.yml
index 71862fd2..e0683ffc 100644
--- a/app/config/services.yml
+++ b/app/config/services.yml
@@ -20,10 +20,8 @@ services:
             - { name: twig.extension }
 
     wallabag.twig_piwik_extension:
-        class: Wallabag\CoreBundle\Twig\WallabagPiwikExtension
+        class: PiwikTwigExtension\PiwikTwigExtension
         public: false
-        arguments:
-            - "@craue_config"
         tags:
             - { name: twig.extension }
 
diff --git a/src/Wallabag/CoreBundle/Resources/views/base.html.twig b/src/Wallabag/CoreBundle/Resources/views/base.html.twig
index 8ca21728..3cadabfb 100644
--- a/src/Wallabag/CoreBundle/Resources/views/base.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/base.html.twig
@@ -71,6 +71,9 @@
         <div id="warning_message">
             You're trying wallabag v2, which is in alpha version. If you find a bug, please have a look to <a href="https://github.com/wallabag/wallabag/issues">our issues list</a> and <a href="https://github.com/wallabag/wallabag/issues/new">open a new if necessary</a>
         </div>
-        {{ piwik() }}
+
+        {% if craue_setting('piwik_enabled') %}
+            {{ piwik(craue_setting('piwik_host'), craue_setting('piwik_site_id')) }}
+        {% endif %}
     </body>
 </html>
diff --git a/src/Wallabag/CoreBundle/Twig/WallabagPiwikExtension.php b/src/Wallabag/CoreBundle/Twig/WallabagPiwikExtension.php
deleted file mode 100644
index 7725cd80..00000000
--- a/src/Wallabag/CoreBundle/Twig/WallabagPiwikExtension.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace Wallabag\CoreBundle\Twig;
-
-use Craue\ConfigBundle\Util\Config;
-use PiwikTwigExtension\PiwikTwigExtension;
-
-class WallabagPiwikExtension extends PiwikTwigExtension
-{
-    public function __construct(Config $craueConfig)
-    {
-        parent::__construct($craueConfig->get('piwik_host'), $craueConfig->get('piwik_site_id'), $craueConfig->get('piwik_enabled'));
-    }
-}