Commit dbd2bb66 authored by Morris Jobke's avatar Morris Jobke
Browse files

Merge pull request #14357 from owncloud/fix/1373

Run `updateDataDirectory` after Update
parents f9fd1629 c3c99344
......@@ -12,6 +12,7 @@ use OC\Hooks\BasicEmitter;
use OC_App;
use OC_Util;
use OCP\IConfig;
use OC\Setup;
/**
* Class that handles autoupdating of ownCloud
......@@ -202,13 +203,12 @@ class Updater extends BasicEmitter {
throw new \Exception('Updates between multiple major versions are unsupported.');
}
// Update htaccess files for apache hosts
if (isset($_SERVER['SERVER_SOFTWARE']) && strstr($_SERVER['SERVER_SOFTWARE'], 'Apache')) {
try {
\OC\Setup::updateHtaccess();
} catch (\Exception $e) {
throw new \Exception($e->getMessage());
}
// Update .htaccess files
try {
Setup::updateHtaccess();
Setup::protectDataDirectory();
} catch (\Exception $e) {
throw new \Exception($e->getMessage());
}
// create empty file in data dir, so we can later find
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment