diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2015-03-11 18:33:51 +0100 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2015-03-11 18:33:51 +0100 |
| commit | dbd2bb66e970cc3c80c627193f5c0cd671dcc929 (patch) | |
| tree | 26cad2eaf03e88295f99c01b170973145fb04712 | |
| parent | f9fd1629da293cf759ba72554da26548d2d25a0f (diff) | |
| parent | c3c993446ebf524740b457ab8f4a7e16d9bb6c55 (diff) | |
| download | nextcloud-server-dbd2bb66e970cc3c80c627193f5c0cd671dcc929.tar.gz nextcloud-server-dbd2bb66e970cc3c80c627193f5c0cd671dcc929.zip | |
Merge pull request #14357 from owncloud/fix/1373
Run `updateDataDirectory` after Update
| -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 302003e666c..4d813ee3d39 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 @@ -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 |