Skip to content

Commit 84df632

Browse files
authored
Merge pull request #30747 from nextcloud/backport/30615/stable23
2 parents 49a8a8f + 38221b8 commit 84df632

28 files changed

+163
-124
lines changed

core/Controller/SetupController.php

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public function run($post) {
7878
$options = array_merge($opts, $post, $errors);
7979
$this->display($options);
8080
} else {
81-
$this->finishSetup(isset($post['install-recommended-apps']));
81+
$this->finishSetup();
8282
}
8383
} else {
8484
$options = array_merge($opts, $post);
@@ -106,7 +106,7 @@ public function display($post) {
106106
\OC_Template::printGuestPage('', 'installation', $parameters);
107107
}
108108

109-
private function finishSetup(bool $installRecommended) {
109+
private function finishSetup() {
110110
if (file_exists($this->autoConfigFile)) {
111111
unlink($this->autoConfigFile);
112112
}
@@ -118,13 +118,8 @@ private function finishSetup(bool $installRecommended) {
118118
}
119119
}
120120

121-
if ($installRecommended) {
122-
header('Location: ' . \OC::$server->getURLGenerator()->getAbsoluteURL('index.php/core/apps/recommended'));
123-
exit();
124-
} else {
125-
header('Location: ' . \OC::$server->getURLGenerator()->linkToDefaultPageUrl());
126-
exit();
127-
}
121+
header('Location: ' . \OC::$server->getURLGenerator()->getAbsoluteURL('index.php/core/apps/recommended'));
122+
exit();
128123
}
129124

130125
public function loadAutoConfig($post) {

core/css/guest.css

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -667,18 +667,14 @@ form #selectDbType label span {
667667
margin: 5px 0 !important;
668668
}
669669

670-
#install-recommended-apps + label span {
671-
display: inline-block;
672-
opacity: .7;
673-
}
674-
675670
/* Errors */
676671
/* Warnings and errors are the same */
677672
.body-login-container,
678673
.warning,
679674
.update,
680675
.error {
681-
display: block;
676+
display: flex;
677+
flex-direction: column;
682678
margin-top: 15px;
683679
padding: 15px;
684680
background-color: rgba(0,0,0,.3);

core/js/dist/files_client.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/js/dist/files_client.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/js/dist/files_fileinfo.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/js/dist/files_fileinfo.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/js/dist/files_iedavclient.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/js/dist/files_iedavclient.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/js/dist/install.js

Lines changed: 11 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/js/dist/install.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)