From 3c3042cc06db8b591565e13623b748af406ce88a Mon Sep 17 00:00:00 2001
From: Thomas Steur <thomas.steur@googlemail.com>
Date: Sat, 13 Sep 2014 16:11:42 +0200
Subject: [PATCH] refs #4996 activate contents plugin on update
---
core/Updates/2.7.0-b2.php | 18 ++++++------------
tests/PHPUnit/UI | 2 +-
2 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/core/Updates/2.7.0-b2.php b/core/Updates/2.7.0-b2.php
index 914d2ab65e..708fdd8ab4 100644
--- a/core/Updates/2.7.0-b2.php
+++ b/core/Updates/2.7.0-b2.php
@@ -9,27 +9,21 @@
namespace Piwik\Updates;
-use Piwik\Common;
-use Piwik\Updater;
use Piwik\Updates;
/**
*/
class Updates_2_7_0_b2 extends Updates
{
- static function getSql()
- {
- return array(
- 'ALTER TABLE `' . Common::prefixTable('log_visit') . '`
- ADD `user_id` varchar(200) NULL AFTER `config_id`
- ' => array(1060),
- );
- }
static function update()
{
- // Run the SQL
- Updater::updateDatabase(__FILE__, self::getSql());
+ $pluginManager = \Piwik\Plugin\Manager::getInstance();
+
+ try {
+ $pluginManager->activatePlugin('Contents');
+ } catch(\Exception $e) {
+ }
}
}
diff --git a/tests/PHPUnit/UI b/tests/PHPUnit/UI
index 5e2e046095..7ff7fab21b 160000
--- a/tests/PHPUnit/UI
+++ b/tests/PHPUnit/UI
@@ -1 +1 @@
-Subproject commit 5e2e04609548450e6f5f584df4730abe9120e484
+Subproject commit 7ff7fab21b24b2fe4bace954ff68b979c520d4e6
--
GitLab