diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-06-13 14:39:02 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-13 14:39:02 -0500 |
| commit | c4bb37b4ee92bdfded4cf5c7ed6dc666a0c23074 (patch) | |
| tree | ece02c35e2fa6e153a0eed1318aac3a366cf7881 | |
| parent | e7b5c5c268da7006a025767cc07b83582ea034b0 (diff) | |
| parent | 8760abae636b1c6f3f37e78300b318adb98d0220 (diff) | |
| download | nextcloud-server-c4bb37b4ee92bdfded4cf5c7ed6dc666a0c23074.tar.gz nextcloud-server-c4bb37b4ee92bdfded4cf5c7ed6dc666a0c23074.zip | |
Merge pull request #5383 from nextcloud/revert-5259
Revert "allow admin to disable groups on personal page"
| -rw-r--r-- | config/config.sample.php | 5 | ||||
| -rw-r--r-- | settings/personal.php | 1 | ||||
| -rw-r--r-- | settings/templates/personal.php | 2 |
3 files changed, 0 insertions, 8 deletions
diff --git a/config/config.sample.php b/config/config.sample.php index 60c184306d4..9cff1a4b876 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -1548,9 +1548,4 @@ $CONFIG = array( */ 'gs.federation' => 'internal', -/** - * show group membership on the personal page - */ -'settings.personal.showGroupMembership' => true - ); diff --git a/settings/personal.php b/settings/personal.php index e8c72e0036a..fefd8392a10 100644 --- a/settings/personal.php +++ b/settings/personal.php @@ -160,7 +160,6 @@ if ($storageInfo['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED) { $uid = $user->getUID(); $userData = $accountManager->getUser($user); -$tmpl->assign('showGroupMembership', $config->getSystemValue('settings.personal.showGroupMembership', true)); $tmpl->assign('total_space', $totalSpace); $tmpl->assign('usage_relative', $storageInfo['relative']); $tmpl->assign('quota', $storageInfo['quota']); diff --git a/settings/templates/personal.php b/settings/templates/personal.php index b4a761a5628..dbc5b5611d5 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -257,7 +257,6 @@ <div class="clear"></div> -<?php if ($_['showGroupMembership'] === true): ?> <div id="groups" class="section"> <h2><?php p($l->t('Groups')); ?></h2> <p><?php p($l->t('You are member of the following groups:')); ?></p> @@ -265,7 +264,6 @@ <?php p(implode(', ', $_['groups'])); ?> </p> </div> -<?php endif; ?> <?php if($_['passwordChangeSupported']) { |