diff options
author | Matthieu Napoli <matthieu@mnapoli.fr> | 2014-11-27 03:56:56 +0300 |
---|---|---|
committer | Matthieu Napoli <matthieu@mnapoli.fr> | 2014-11-27 03:56:56 +0300 |
commit | 0c80a9be897972650d3e176943c0c63fcddcd6ca (patch) | |
tree | 7115929216c7969ff167cb5deb17777bb02aa7f2 /core/Twig.php | |
parent | 9ea42bb907d9ddbb1ca7e0868e34b3a46de1973e (diff) | |
parent | 7bab10fc9dd46037e39e5cbb3dcca2b420528051 (diff) |
Merge branch 'di-config' into tmp-path
Conflicts:
tests/PHPUnit/Integration/LogTest.php
Diffstat (limited to 'core/Twig.php')
-rwxr-xr-x | core/Twig.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/Twig.php b/core/Twig.php index bf840950a5..1ce277e235 100755 --- a/core/Twig.php +++ b/core/Twig.php @@ -11,7 +11,6 @@ namespace Piwik; use Exception; use Piwik\Container\StaticContainer; use Piwik\DataTable\Filter\SafeDecodeLabel; -use Piwik\Period\Range; use Piwik\Translate; use Piwik\View\RenderTokenParser; use Piwik\Visualization\Sparkline; @@ -245,7 +244,7 @@ class Twig protected function addFilter_prettyDate() { $prettyDate = new Twig_SimpleFilter('prettyDate', function ($dateString, $period) { - return Range::factory($period, $dateString)->getLocalizedShortString(); + return Period\Factory::build($period, $dateString)->getLocalizedShortString(); }); $this->twig->addFilter($prettyDate); } |