diff options
| -rw-r--r-- | config/global.ini.php | 1 | ||||
| -rw-r--r-- | core/Config.php | 10 | ||||
| -rw-r--r-- | core/Plugin/Manager.php | 1 | ||||
| -rw-r--r-- | core/Updates/2.4.0-b6.php | 24 | ||||
| -rw-r--r-- | core/Version.php | 2 | ||||
| -rw-r--r-- | plugins/CoreConsole/Commands/SyncUITestScreenshots.php | 2 | ||||
| m--------- | tests/PHPUnit/UI | 0 |
7 files changed, 27 insertions, 13 deletions
diff --git a/config/global.ini.php b/config/global.ini.php index 008b535e0f..b5b21294bc 100644 --- a/config/global.ini.php +++ b/config/global.ini.php @@ -609,6 +609,7 @@ Plugins[] = Dashboard Plugins[] = MultiSites Plugins[] = Referrers Plugins[] = UserSettings +Plugins[] = DevicesDetection Plugins[] = Goals Plugins[] = SEO Plugins[] = Events diff --git a/core/Config.php b/core/Config.php index 6c80734258..1f91d554f0 100644 --- a/core/Config.php +++ b/core/Config.php @@ -148,16 +148,6 @@ class Config extends Singleton // for unit tests, we set that no plugin is installed. This will force // the test initialization to create the plugins tables, execute ALTER queries, etc. $this->configCache['PluginsInstalled'] = array('PluginsInstalled' => array()); - - // DevicesDetection plugin is not yet enabled by default - if (isset($configGlobal['Plugins'])) { - $this->configCache['Plugins'] = $this->configGlobal['Plugins']; - $this->configCache['Plugins']['Plugins'][] = 'DevicesDetection'; - } - if (isset($configGlobal['Plugins_Tracker'])) { - $this->configCache['Plugins_Tracker'] = $this->configGlobal['Plugins_Tracker']; - $this->configCache['Plugins_Tracker']['Plugins_Tracker'][] = 'DevicesDetection'; - } } /** diff --git a/core/Plugin/Manager.php b/core/Plugin/Manager.php index 03c3a9f641..2bd01d4a8c 100644 --- a/core/Plugin/Manager.php +++ b/core/Plugin/Manager.php @@ -68,7 +68,6 @@ class Manager extends Singleton // Plugins bundled with core package, disabled by default protected $corePluginsDisabledByDefault = array( 'DBStats', - 'DevicesDetection', 'ExampleCommand', 'ExampleSettingsPlugin', 'ExampleUI', diff --git a/core/Updates/2.4.0-b6.php b/core/Updates/2.4.0-b6.php new file mode 100644 index 0000000000..62ab76c46e --- /dev/null +++ b/core/Updates/2.4.0-b6.php @@ -0,0 +1,24 @@ +<?php +/** + * Piwik - free/libre analytics platform + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + * + */ +namespace Piwik\Updates; + +use Piwik\Updates; + +class Updates_2_4_0_b6 extends Updates +{ + public static function update() + { + $pluginManager = \Piwik\Plugin\Manager::getInstance(); + + try { + $pluginManager->activatePlugin('DevicesDetection'); + } catch(\Exception $e) { + } + } +} diff --git a/core/Version.php b/core/Version.php index 44f3a2f0f9..358d0ee45c 100644 --- a/core/Version.php +++ b/core/Version.php @@ -21,5 +21,5 @@ final class Version * The current Piwik version. * @var string */ - const VERSION = '2.4.0-b5'; + const VERSION = '2.4.0-b6'; } diff --git a/plugins/CoreConsole/Commands/SyncUITestScreenshots.php b/plugins/CoreConsole/Commands/SyncUITestScreenshots.php index 0433657bf1..872b550843 100644 --- a/plugins/CoreConsole/Commands/SyncUITestScreenshots.php +++ b/plugins/CoreConsole/Commands/SyncUITestScreenshots.php @@ -73,7 +73,7 @@ class SyncUITestScreenshots extends ConsoleCommand $downloadTo = "plugins/$testPlugin/tests/UI/expected-ui-screenshots/$file"; } - $output->write("<info>Downloading $file to $downloadTo...</info>\n"); + $output->write("<info>Downloading $file to $downloadTo...</info>\n"); Http::sendHttpRequest("$urlBase/processed-ui-screenshots/$file", $timeout = 60, $userAgent = null, PIWIK_DOCUMENT_ROOT . "/" . $downloadTo); } diff --git a/tests/PHPUnit/UI b/tests/PHPUnit/UI -Subproject 1624d2874eea5d6c32424ee7fb870bfc10ddb38 +Subproject 4a97de9e6dfa05f784d07297a4ab27f5e928c91 |