Skip to content

Commit 885c297

Browse files
authored
Merge pull request #30749 from nextcloud/backport/30615/stable21
2 parents cf3c3d1 + b3bef4a commit 885c297

25 files changed

+113
-66
lines changed

core/Controller/SetupController.php

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

110-
private function finishSetup(bool $installRecommended) {
110+
private function finishSetup() {
111111
if (file_exists($this->autoConfigFile)) {
112112
unlink($this->autoConfigFile);
113113
}
@@ -119,13 +119,8 @@ private function finishSetup(bool $installRecommended) {
119119
}
120120
}
121121

122-
if ($installRecommended) {
123-
$urlGenerator = \OC::$server->getURLGenerator();
124-
$location = $urlGenerator->getAbsoluteURL('index.php/core/apps/recommended');
125-
header('Location: ' . $location);
126-
exit();
127-
}
128-
\OC_Util::redirectToDefaultPage();
122+
header('Location: ' . \OC::$server->getURLGenerator()->getAbsoluteURL('index.php/core/apps/recommended'));
123+
exit();
129124
}
130125

131126
public function loadAutoConfig($post) {

core/css/guest.css

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -656,18 +656,14 @@ form #selectDbType label span {
656656
box-shadow: none !important;
657657
}
658658

659-
#install-recommended-apps + label span {
660-
display: inline-block;
661-
opacity: .7;
662-
}
663-
664659
/* Errors */
665660
/* Warnings and errors are the same */
666661
.body-login-container,
667662
.warning,
668663
.update,
669664
.error {
670-
display: block;
665+
display: flex;
666+
flex-direction: column;
671667
margin-top: 15px;
672668
padding: 15px;
673669
background-color: rgba(0,0,0,.3);

core/js/dist/files_client.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_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: 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.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)