diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-12-09 14:32:00 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-12-09 14:32:00 +0100 |
| commit | 04f4565fcda4c7482c25681863237d05e850562a (patch) | |
| tree | cb8f08e8b07a504d6d4c8e53b421129590a22c16 | |
| parent | 45400e9d4c1e6eeb5b9038ffc3977d033c69a3fb (diff) | |
| parent | b50987165e8be87dacee4715f8548cb8fcde84b7 (diff) | |
| download | nextcloud-server-04f4565fcda4c7482c25681863237d05e850562a.tar.gz nextcloud-server-04f4565fcda4c7482c25681863237d05e850562a.zip | |
Merge pull request #21060 from owncloud/support-for-read-only-config-dir
Add support for read only config dir
| -rw-r--r-- | lib/private/util.php | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/lib/private/util.php b/lib/private/util.php index eb188b649e8..9016dc59751 100644 --- a/lib/private/util.php +++ b/lib/private/util.php @@ -642,13 +642,15 @@ class OC_Util { } // Check if config folder is writable. - if (!is_writable(OC::$configDir) or !is_readable(OC::$configDir)) { - $errors[] = array( - 'error' => $l->t('Cannot write into "config" directory'), - 'hint' => $l->t('This can usually be fixed by ' - . '%sgiving the webserver write access to the config directory%s.', - array('<a href="' . $urlGenerator->linkToDocs('admin-dir_permissions') . '" target="_blank">', '</a>')) - ); + if(!OC_Helper::isReadOnlyConfigEnabled()) { + if (!is_writable(OC::$configDir) or !is_readable(OC::$configDir)) { + $errors[] = array( + 'error' => $l->t('Cannot write into "config" directory'), + 'hint' => $l->t('This can usually be fixed by ' + . '%sgiving the webserver write access to the config directory%s.', + array('<a href="' . $urlGenerator->linkToDocs('admin-dir_permissions') . '" target="_blank">', '</a>')) + ); + } } // Check if there is a writable install folder. |