update Piwik to version 2.16 (fixes #91)

This commit is contained in:
oliver 2016-04-10 18:55:57 +02:00
commit d885a4baa9
5833 changed files with 418860 additions and 226988 deletions

View file

@ -1,6 +1,6 @@
<?php
/**
* Piwik - Open source web analytics
* Piwik - free/libre analytics platform
*
* @link http://piwik.org
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
@ -8,6 +8,8 @@
*/
namespace Piwik;
use Piwik\Metrics\Formatter;
/**
*
*/
@ -15,12 +17,15 @@ class Timer
{
private $timerStart;
private $memoryStart;
private $formatter;
/**
* @return \Piwik\Timer
*/
public function __construct()
{
$this->formatter = new Formatter();
$this->init();
}
@ -56,7 +61,7 @@ class Timer
*/
public function getMemoryLeak()
{
return "Memory delta: " . MetricsFormatter::getPrettySizeFromBytes($this->getMemoryUsage() - $this->memoryStart);
return "Memory delta: " . $this->formatter->getPrettySizeFromBytes($this->getMemoryUsage() - $this->memoryStart);
}
/**