diff options
| -rw-r--r-- | lib/base.php | 4 | ||||
| -rw-r--r-- | lib/private/Config.php | 5 | ||||
| -rw-r--r-- | lib/private/legacy/util.php | 3 |
3 files changed, 3 insertions, 9 deletions
diff --git a/lib/base.php b/lib/base.php index d3b0c42f1bb..6dc08510a7b 100644 --- a/lib/base.php +++ b/lib/base.php @@ -254,7 +254,6 @@ class OC { if (self::$CLI) { echo $l->t('Cannot write into "config" directory!')."\n"; echo $l->t('This can usually be fixed by giving the webserver write access to the config directory')."\n"; - echo $l->t('See %s', [ $urlGenerator->linkToDocs('admin-dir_permissions') ])."\n"; echo "\n"; echo $l->t('Or, if you prefer to keep config.php file read only, set the option "config_is_read_only" to true in it.')."\n"; echo $l->t('See %s', [ $urlGenerator->linkToDocs('admin-config') ])."\n"; @@ -262,8 +261,7 @@ class OC { } else { OC_Template::printErrorPage( $l->t('Cannot write into "config" directory!'), - $l->t('This can usually be fixed by giving the webserver write access to the config directory. See %s', - [ $urlGenerator->linkToDocs('admin-dir_permissions') ]) . '. ' + $l->t('This can usually be fixed by giving the webserver write access to the config directory.') . '. ' . $l->t('Or, if you prefer to keep config.php file read only, set the option "config_is_read_only" to true in it. See %s', [ $urlGenerator->linkToDocs('admin-config') ] ), 503 diff --git a/lib/private/Config.php b/lib/private/Config.php index 5366cd295d4..4b813dfcf21 100644 --- a/lib/private/Config.php +++ b/lib/private/Config.php @@ -246,12 +246,9 @@ class Config { // File does not exist, this can happen when doing a fresh install if(!is_resource ($filePointer)) { - // TODO fix this via DI once it is very clear that this doesn't cause side effects due to initialization order - // currently this breaks app routes but also could have other side effects especially during setup and exception handling - $url = \OC::$server->getURLGenerator()->linkToDocs('admin-dir_permissions'); throw new HintException( "Can't write into config directory!", - 'This can usually be fixed by giving the webserver write access to the config directory. See ' . $url); + 'This can usually be fixed by giving the webserver write access to the config directory.'); } // Try to acquire a file lock diff --git a/lib/private/legacy/util.php b/lib/private/legacy/util.php index 044c3fee7bc..9fce2993a2a 100644 --- a/lib/private/legacy/util.php +++ b/lib/private/legacy/util.php @@ -773,8 +773,7 @@ class OC_Util { $errors[] = [ 'error' => $l->t('Cannot write into "apps" directory'), 'hint' => $l->t('This can usually be fixed by giving the webserver write access to the apps directory' - . ' or disabling the appstore in the config file. See %s', - [$urlGenerator->linkToDocs('admin-dir_permissions')]) + . ' or disabling the appstore in the config file.') ]; } } |