mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #20210 from nextcloud/fix/outdated/admin-dir_permissions 

Remove outdated admin-dir_permissions documentation link
This commit is contained in:
Joas Schilling 2020-03-31 14:24:39 +02:00 committed by GitHub
parent 820e138316 82b0cd2e7a
commit 09d56e9d3d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/base.php
View File

@ -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

5
lib/private/Config.php
View File

@ -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

3
lib/private/legacy/util.php
View File

@ -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.')
];
}
}