diff options
| -rw-r--r-- | lib/base.php | 3 | ||||
| -rw-r--r-- | lib/private/legacy/OC_Helper.php | 3 | ||||
| -rw-r--r-- | lib/private/legacy/OC_Util.php | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/lib/base.php b/lib/base.php index 45058db1600..ad80df357c5 100644 --- a/lib/base.php +++ b/lib/base.php @@ -196,7 +196,8 @@ class OC { // Check if config is writable $configFileWritable = is_writable($configFilePath); - if (!$configFileWritable && !OC_Helper::isReadOnlyConfigEnabled() + $configReadOnly = Server::get(IConfig::class)->getSystemValueBool('config_is_read_only'); + if (!$configFileWritable && !$configReadOnly || !$configFileWritable && \OCP\Util::needUpgrade()) { $urlGenerator = Server::get(IURLGenerator::class); $l = Server::get(\OCP\L10N\IFactory::class)->get('lib'); diff --git a/lib/private/legacy/OC_Helper.php b/lib/private/legacy/OC_Helper.php index a06b15573cb..87c820dcd53 100644 --- a/lib/private/legacy/OC_Helper.php +++ b/lib/private/legacy/OC_Helper.php @@ -199,7 +199,7 @@ class OC_Helper { /** * Try to find a program - * @deprecated 25.0.0 Use \OC\BinaryFinder directly + * @deprecated 25.0.0 Use \OCP\IBinaryFinder directly */ public static function findBinaryPath(string $program): ?string { $result = Server::get(IBinaryFinder::class)->findBinaryPath($program); @@ -415,6 +415,7 @@ class OC_Helper { /** * Returns whether the config file is set manually to read-only * @return bool + * @deprecated 32.0.0 use the `config_is_read_only` system config directly */ public static function isReadOnlyConfigEnabled() { return \OC::$server->getConfig()->getSystemValueBool('config_is_read_only', false); diff --git a/lib/private/legacy/OC_Util.php b/lib/private/legacy/OC_Util.php index 895cfba35c5..9444da4f36d 100644 --- a/lib/private/legacy/OC_Util.php +++ b/lib/private/legacy/OC_Util.php @@ -98,6 +98,7 @@ class OC_Util { * * @param IUser|null $user * @return int|\OCP\Files\FileInfo::SPACE_UNLIMITED|false|float Quota bytes + * @deprecated 9.0.0 - Use \OCP\IUser::getQuota */ public static function getUserQuota(?IUser $user) { if (is_null($user)) { @@ -331,7 +332,7 @@ class OC_Util { } // Check if config folder is writable. - if (!OC_Helper::isReadOnlyConfigEnabled()) { + if (!(bool)$config->getValue('config_is_read_only', false)) { if (!is_writable(OC::$configDir) or !is_readable(OC::$configDir)) { $errors[] = [ 'error' => $l->t('Cannot write into "config" directory.'), |