Skip to content

Use version from config to generate doclink #12896

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rullzer merged 2 commits into from
Dec 10, 2018
Merged

Use version from config to generate doclink #12896

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6016d45
Use version to generate docversion
kesselb Dec 6, 2018
5ee6e5b
Use OC_Util::getVersion instead of getSystemValue
kesselb Dec 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions lib/private/legacy/defaults.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
class OC_Defaults {

private $theme;
private $l;

private $defaultEntity;
private $defaultName;
Expand All @@ -53,7 +52,7 @@ class OC_Defaults {
private $defaultTextColorPrimary;

public function __construct() {
$this->l = \OC::$server->getL10N('lib');
$l10n = \OC::$server->getL10N('lib');
$config = \OC::$server->getConfig();

$this->defaultEntity = 'Nextcloud'; /* e.g. company name, used for footers and copyright notices */
Expand All @@ -65,8 +64,8 @@ public function __construct() {
$this->defaultiTunesAppId = $config->getSystemValue('customclient_ios_appid', '1125420102');
$this->defaultAndroidClientUrl = $config->getSystemValue('customclient_android', 'https://play.google.com/store/apps/details?id=com.nextcloud.client');
$this->defaultDocBaseUrl = 'https://docs.nextcloud.com';
$this->defaultDocVersion = '14'; // used to generate doc links
$this->defaultSlogan = $this->l->t('a safe home for all your data');
$this->defaultDocVersion = \OC_Util::getVersion()[0]; // used to generate doc links
$this->defaultSlogan = $l10n->t('a safe home for all your data');
$this->defaultColorPrimary = '#0082c9';
$this->defaultTextColorPrimary = '#ffffff';

Expand Down