Refs #4125 Fixes

matomo-org · Oct 7, 2013 · e4f1bdd · e4f1bdd
1 parent 4d3527c
commit e4f1bdd
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/core/Filechecks.php b/core/Filechecks.php
@@ -48,8 +48,7 @@ public static function checkDirectoriesWritable($directoriesToCheck)
             $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
@@ -50,9 +50,6 @@ public static function update()
         \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 @@ public static function update()
             }
         }
 
+        \Piwik\PluginsManager::getInstance()->deactivatePlugin('Referers');
+        \Piwik\PluginsManager::getInstance()->deactivatePlugin('PDFReports');
+
         try {
             \Piwik\PluginsManager::getInstance()->activatePlugin('Referrers');
         } catch(Exception $e) {

diff --git a/...templates/reportParametersPDFReports.twig → ...tes/reportParametersScheduledReports.twig b/...templates/reportParametersPDFReports.twig → ...tes/reportParametersScheduledReports.twig
diff --git a/...templates/reportParametersPDFReports.twig → ...tes/reportParametersScheduledReports.twig b/...templates/reportParametersPDFReports.twig → ...tes/reportParametersScheduledReports.twig