Merge pull request #22589 from nextcloud/bugfix/noid/allow-additional-personal-settings-via-normal-registration

blizzz · web-flow · commit 3eb748fc39e2 · 2020-09-07T11:34:06.000+02:00
Allow additional personal settings via normal registration
diff --git a/lib/private/Settings/Manager.php b/lib/private/Settings/Manager.php
@@ -261,7 +261,8 @@ public function getPersonalSections(): array {
 		$sections = [];
 
 		$legacyForms = \OC_App::getForms('personal');
-		if (!empty($legacyForms) && $this->hasLegacyPersonalSettingsToRender($legacyForms)) {
+		if ((!empty($legacyForms) && $this->hasLegacyPersonalSettingsToRender($legacyForms))
+			|| count($this->getPersonalSettings('additional')) > 1) {
 			$sections[98] = [new Section('additional', $this->l->t('Additional settings'), 0, $this->url->imagePath('core', 'actions/settings-dark.svg'))];
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,8 @@ public function getPersonalSections(): array {`
`261`	`261`	`$sections = [];`
`262`	`262`
`263`	`263`	`$legacyForms = \OC_App::getForms('personal');`
`264`		`- if (!empty($legacyForms) && $this->hasLegacyPersonalSettingsToRender($legacyForms)) {`
	`264`	`+ if ((!empty($legacyForms) && $this->hasLegacyPersonalSettingsToRender($legacyForms))`
	`265`	`+ \|\| count($this->getPersonalSettings('additional')) > 1) {`
`265`	`266`	`$sections[98] = [new Section('additional', $this->l->t('Additional settings'), 0, $this->url->imagePath('core', 'actions/settings-dark.svg'))];`
`266`	`267`	`}`
`267`	`268`