upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

Merge pull request #34136 from nextcloud/fix/default-channel

Browse source 
on installation save channel to config.php if not stable
This commit is contained in:
blizzz 2022-10-21 17:14:56 +02:00 committed by GitHub
commit 294a00d8e0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
build/psalm-baseline.xml
View file

@ -3371,6 +3371,9 @@
<code>$content !== ''</code>
<code>$type === 'pdo'</code>
</RedundantCondition>
<UndefinedVariable occurrences="1">
<code>$vendor</code>
</UndefinedVariable>
</file>
<file src="lib/private/Setup/AbstractDatabase.php">
<UndefinedThisPropertyFetch occurrences="4">

24
lib/private/Setup.php
View file

@ -393,7 +393,12 @@ class Setup {
$config = \OC::$server->getConfig();
$config->setAppValue('core', 'installedat', microtime(true));
$config->setAppValue('core', 'lastupdatedat', microtime(true));
$config->setAppValue('core', 'vendor', $this->getVendor());
$vendorData = $this->getVendorData();
$config->setAppValue('core', 'vendor', $vendorData['vendor']);
if ($vendorData['channel'] !== 'stable') {
$config->setSystemValue('updater.release.channel', $vendorData['channel']);
}
$group = \OC::$server->getGroupManager()->createGroup('admin');
if ($group instanceof IGroup) {
@ -582,17 +587,14 @@ class Setup {
file_put_contents($baseDir . '/index.html', '');
}
/**
* Return vendor from which this version was published
*
* @return string Get the vendor
*
* Copy of \OC\Updater::getVendor()
*/
private function getVendor() {
private function getVendorData(): array {
// this should really be a JSON file
require \OC::$SERVERROOT . '/version.php';
/** @var string $vendor */
return (string)$vendor;
/** @var mixed $vendor */
/** @var mixed $OC_Channel */
return [
'vendor' => (string)$vendor,
'channel' => (string)$OC_Channel,
];
}
}