coderkun/questlab
1
0
Fork 0
Code Issues 15 Pull requests Projects Releases Wiki Activity

update Piwik to version 2.16 (fixes #91)

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

17
www/analytics/core/Updates/2.0.4-b5.php
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
@ -10,19 +10,19 @@
namespace Piwik\Updates;
use Piwik\Common;
use Piwik\Config;
use Piwik\Date;
use Piwik\Db;
use Piwik\Plugins\UsersManager\API as UsersManagerApi;
use Piwik\Updater;
use Piwik\UpdaterErrorException;
use Piwik\Updates;
use Piwik\Config;
/**
*/
class Updates_2_0_4_b5 extends Updates
{
static function getSql()
public function getMigrationQueries(Updater $updater)
{
return array(
// ignore existing column name error (1060)
@ -31,9 +31,9 @@ class Updates_2_0_4_b5 extends Updates
);
}
static function update()
public function doUpdate(Updater $updater)
{
Updater::updateDatabase(__FILE__, self::getSql());
$updater->executeMigrationQueries(__FILE__, $this->getMigrationQueries($updater));
try {
self::migrateConfigSuperUserToDb();
@ -56,7 +56,10 @@ class Updates_2_0_4_b5 extends Updates
$superUser = null;
}
if (!empty($superUser['bridge']) || empty($superUser)) {
if (!empty($superUser['bridge'])
|| empty($superUser)
|| empty($superUser['login'])
) {
// there is a super user which is not from the config but from the bridge, that means we already have
// a super user in the database
return;
@ -75,7 +78,7 @@ class Updates_2_0_4_b5 extends Updates
'superuser_access' => 1
)
);
} catch(\Exception $e) {
} catch (\Exception $e) {
echo "There was an issue, but we proceed: " . $e->getMessage();
}