diff options
author | Julius Härtl <jus@bitgrid.net> | 2021-03-05 10:04:09 +0100 |
---|---|---|
committer | Julius Härtl <jus@bitgrid.net> | 2021-06-16 11:42:53 +0200 |
commit | c0474ba3644fc94674788bf21dd3e22d564e019c (patch) | |
tree | e4709fae17df27be50696c314ec75cb469b99e26 /lib | |
parent | 4673b54a2cfcdf7976fcd295b98d72858619ffad (diff) | |
download | nextcloud-server-c0474ba3644fc94674788bf21dd3e22d564e019c.tar.gz nextcloud-server-c0474ba3644fc94674788bf21dd3e22d564e019c.zip |
Use product name in places where it is appropriate rather than the instance name
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/private/Setup.php | 4 | ||||
-rw-r--r-- | lib/private/Template/JSConfigHelper.php | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/private/Setup.php b/lib/private/Setup.php index 3475ee3e65b..5234be0bf3e 100644 --- a/lib/private/Setup.php +++ b/lib/private/Setup.php @@ -239,7 +239,7 @@ class Setup { 'error' => $this->l10n->t( 'Mac OS X is not supported and %s will not work properly on this platform. ' . 'Use it at your own risk! ', - [$this->defaults->getName()] + [$this->defaults->getProductName()] ), 'hint' => $this->l10n->t('For the best results, please consider using a GNU/Linux server instead.'), ]; @@ -250,7 +250,7 @@ class Setup { 'error' => $this->l10n->t( 'It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir has been configured in php.ini. ' . 'This will lead to problems with files over 4 GB and is highly discouraged.', - [$this->defaults->getName()] + [$this->defaults->getProductName()] ), 'hint' => $this->l10n->t('Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP.'), ]; diff --git a/lib/private/Template/JSConfigHelper.php b/lib/private/Template/JSConfigHelper.php index 1452ccc463f..2cc8f6ca3fd 100644 --- a/lib/private/Template/JSConfigHelper.php +++ b/lib/private/Template/JSConfigHelper.php @@ -293,6 +293,7 @@ class JSConfigHelper { "_theme" => json_encode([ 'entity' => $this->defaults->getEntity(), 'name' => $this->defaults->getName(), + 'productName' => $this->defaults->getProductName(), 'title' => $this->defaults->getTitle(), 'baseUrl' => $this->defaults->getBaseUrl(), 'syncClientUrl' => $this->defaults->getSyncClientUrl(), |