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
@ -25,7 +25,7 @@ class DbTable implements Zend_Session_SaveHandler_Interface
/**
* @param array $config
*/
function __construct($config)
public function __construct($config)
{
$this->config = $config;
$this->maxLifetime = ini_get('session.gc_maxlifetime');
@ -78,8 +78,9 @@ class DbTable implements Zend_Session_SaveHandler_Interface
. ' AND ' . $this->config['modifiedColumn'] . ' + ' . $this->config['lifetimeColumn'] . ' >= ?';
$result = Db::get()->fetchOne($sql, array($id, time()));
if (!$result)
if (!$result) {
$result = '';
}
return $result;
}
@ -118,8 +119,7 @@ class DbTable implements Zend_Session_SaveHandler_Interface
*/
public function destroy($id)
{
$sql = 'DELETE FROM ' . $this->config['name']
. ' WHERE ' . $this->config['primary'] . ' = ?';
$sql = 'DELETE FROM ' . $this->config['name'] . ' WHERE ' . $this->config['primary'] . ' = ?';
Db::get()->query($sql, array($id));

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
@ -9,6 +9,7 @@
namespace Piwik\Session;
use Piwik\Common;
use Piwik\Session;
use Zend_Session_Namespace;
/**
@ -28,6 +29,8 @@ class SessionNamespace extends Zend_Session_Namespace
return;
}
Session::start();
parent::__construct($namespace, $singleInstance);
}
}