aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2016-02-22 10:58:43 +0100
committerJeremy Benoist <jeremy.benoist@gmail.com>2016-02-22 11:11:08 +0100
commit077ddbe1aef64326f39e5e9a9f27517dd8d6ea44 (patch)
tree671232cc208da0427bcf94aed56e7f5740a7f334 /src
parent07643dde08a7cd3f5a556021643e64dd1d5e89f2 (diff)
downloadwallabag-077ddbe1aef64326f39e5e9a9f27517dd8d6ea44.tar.gz
wallabag-077ddbe1aef64326f39e5e9a9f27517dd8d6ea44.tar.zst
wallabag-077ddbe1aef64326f39e5e9a9f27517dd8d6ea44.zip
Use a different way to use piwik
Diffstat (limited to 'src')
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/base.html.twig5
-rw-r--r--src/Wallabag/CoreBundle/Twig/WallabagPiwikExtension.php14
2 files changed, 4 insertions, 15 deletions
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 @@
71 <div id="warning_message"> 71 <div id="warning_message">
72 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> 72 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>
73 </div> 73 </div>
74 {{ piwik() }} 74
75 {% if craue_setting('piwik_enabled') %}
76 {{ piwik(craue_setting('piwik_host'), craue_setting('piwik_site_id')) }}
77 {% endif %}
75 </body> 78 </body>
76</html> 79</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 @@
1<?php
2
3namespace Wallabag\CoreBundle\Twig;
4
5use Craue\ConfigBundle\Util\Config;
6use PiwikTwigExtension\PiwikTwigExtension;
7
8class WallabagPiwikExtension extends PiwikTwigExtension
9{
10 public function __construct(Config $craueConfig)
11 {
12 parent::__construct($craueConfig->get('piwik_host'), $craueConfig->get('piwik_site_id'), $craueConfig->get('piwik_enabled'));
13 }
14}