diff options
| author | mattab <matthieu.aubry@gmail.com> | 2013-10-07 09:36:42 +0400 |
|---|---|---|
| committer | mattab <matthieu.aubry@gmail.com> | 2013-10-07 09:36:42 +0400 |
| commit | e4f1bdde8409eff228f9377c57a2339c201d34e3 (patch) | |
| tree | d6d13c61ac5a40b83620007849a251956faf4d43 /core | |
| parent | 4d3527c3dd2aaf5fa388b670120eb48f439fd9e2 (diff) | |
Refs #4125 Fixes
Diffstat (limited to 'core')
| -rw-r--r-- | core/Filechecks.php | 3 | ||||
| -rw-r--r-- | core/Updates/2.0-a13.php | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/core/Filechecks.php b/core/Filechecks.php index 893e158d62..1ccb648d19 100644 --- a/core/Filechecks.php +++ b/core/Filechecks.php @@ -48,8 +48,7 @@ class Filechecks $directoryToCheck = SettingsPiwik::rewriteTmpPathWithHostname($directoryToCheck); // Create an empty directory - $isFile = strpos($directoryToCheck, '.') !== false; - if (!$isFile && !file_exists($directoryToCheck)) { + if (!file_exists($directoryToCheck)) { Filesystem::mkdir($directoryToCheck); } diff --git a/core/Updates/2.0-a13.php b/core/Updates/2.0-a13.php index 346cb88be0..f02a62710a 100644 --- a/core/Updates/2.0-a13.php +++ b/core/Updates/2.0-a13.php @@ -50,9 +50,6 @@ class Piwik_Updates_2_0_a13 extends Updates \Piwik\Option::getInstance()->delete('version_Referers'); Updater::updateDatabase(__FILE__, self::getSql()); - \Piwik\PluginsManager::getInstance()->deactivatePlugin('Referers'); - \Piwik\PluginsManager::getInstance()->deactivatePlugin('PDFReports'); - // Deleting old plugins $obsoleteDirectories = array( PIWIK_INCLUDE_PATH . '/plugins/Referers', @@ -64,6 +61,9 @@ class Piwik_Updates_2_0_a13 extends Updates } } + \Piwik\PluginsManager::getInstance()->deactivatePlugin('Referers'); + \Piwik\PluginsManager::getInstance()->deactivatePlugin('PDFReports'); + try { \Piwik\PluginsManager::getInstance()->activatePlugin('Referrers'); } catch(Exception $e) { |