diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2015-03-26 14:51:33 +0100 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2015-03-28 13:59:22 +0100 |
| commit | 65202d2a18aca3b253ce5f3c7c9af17ee6d12e52 (patch) | |
| tree | 04453d95db5dc3df386188cd85032052fded6db9 /lib/private/setup.php | |
| parent | d3752ca1e925c3aed46c13f7ea26c8f540db05e0 (diff) | |
| download | nextcloud-server-65202d2a18aca3b253ce5f3c7c9af17ee6d12e52.tar.gz nextcloud-server-65202d2a18aca3b253ce5f3c7c9af17ee6d12e52.zip | |
Add check for activated local memcache
Also used the opportunity to refactor it into an AppFramework controller so that we can unit test it.
Fixes https://github.com/owncloud/core/issues/14956
Diffstat (limited to 'lib/private/setup.php')
| -rw-r--r-- | lib/private/setup.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/private/setup.php b/lib/private/setup.php index 1aa2af124c6..7ca30e172ec 100644 --- a/lib/private/setup.php +++ b/lib/private/setup.php @@ -181,7 +181,8 @@ class Setup { \OC\Setup::protectDataDirectory(); try { - $htAccessWorking = \OC_Util::isHtaccessWorking(); + $util = new \OC_Util(); + $htAccessWorking = $util->isHtaccessWorking(\OC::$server->getConfig()); } catch (\OC\HintException $e) { $errors[] = array( 'error' => $e->getMessage(), |