aboutsummaryrefslogtreecommitdiffstats
path: root/lib/base.php
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2015-11-26 10:48:08 +0100
committerMorris Jobke <hey@morrisjobke.de>2015-11-26 13:58:43 +0100
commit675417a75c3c0d93838397b4670e2d26d53eb2fe (patch)
treed14e4cbeb4aaca161b970c4f54f95e8b75a472d9 /lib/base.php
parent3882cc8ef37a28972a8fca35ca1cc26cc060e7bc (diff)
downloadnextcloud-server-675417a75c3c0d93838397b4670e2d26d53eb2fe.tar.gz
nextcloud-server-675417a75c3c0d93838397b4670e2d26d53eb2fe.zip
Untangle the linkToDocs method in OC_Helper
* now uses the proper URLGenerator interface * add comment about DI problems
Diffstat (limited to 'lib/base.php')
-rw-r--r--lib/base.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/base.php b/lib/base.php
index feaf46e83f1..6a1841fa93b 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -246,18 +246,21 @@ class OC {
$configFileWritable = is_writable($configFilePath);
if (!$configFileWritable && !OC_Helper::isReadOnlyConfigEnabled()
|| !$configFileWritable && self::checkUpgrade(false)) {
+
+ $urlGenerator = \OC::$server->getURLGenerator();
+
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 "\n";
- echo $l->t('See %s', array(\OC_Helper::linkToDocs('admin-dir_permissions')))."\n";
+ echo $l->t('See %s', [ $urlGenerator->linkToDocs('admin-dir_permissions') ])."\n";
exit;
} else {
OC_Template::printErrorPage(
$l->t('Cannot write into "config" directory!'),
$l->t('This can usually be fixed by '
. '%sgiving the webserver write access to the config directory%s.',
- array('<a href="'.\OC_Helper::linkToDocs('admin-dir_permissions').'" target="_blank">', '</a>'))
+ array('<a href="' . $urlGenerator->linkToDocs('admin-dir_permissions') . '" target="_blank">', '</a>'))
);
}
}