diff options
author | Lukas Reschke <lukas@owncloud.com> | 2015-02-19 02:15:21 +0100 |
---|---|---|
committer | Lukas Reschke <lukas@owncloud.com> | 2015-03-02 19:39:17 +0100 |
commit | c3c993446ebf524740b457ab8f4a7e16d9bb6c55 (patch) | |
tree | 1b6365563f2f36675f6067053777ffd38b3746b0 /lib/private | |
parent | 1155ad6e389e47e110a415f22eddda1570dc9ff2 (diff) | |
download | nextcloud-server-c3c993446ebf524740b457ab8f4a7e16d9bb6c55.tar.gz nextcloud-server-c3c993446ebf524740b457ab8f4a7e16d9bb6c55.zip |
Run `updateDataDirectory` after Update
Fixes https://github.com/owncloud/core/issues/13731
Diffstat (limited to 'lib/private')
-rw-r--r-- | lib/private/updater.php | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/private/updater.php b/lib/private/updater.php index 71ada3217e0..af196166355 100644 --- a/lib/private/updater.php +++ b/lib/private/updater.php @@ -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 @@ -188,13 +189,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 |