summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2017-06-13 10:43:21 -0500
committerMorris Jobke <hey@morrisjobke.de>2017-06-13 10:43:21 -0500
commit8760abae636b1c6f3f37e78300b318adb98d0220 (patch)
tree54e200c275cf1e1937794d33ac3691fca9bb3e19 /settings
parent2f7f6e28a26201bee3bb1bf449c78794ee9529cf (diff)
downloadnextcloud-server-8760abae636b1c6f3f37e78300b318adb98d0220.tar.gz
nextcloud-server-8760abae636b1c6f3f37e78300b318adb98d0220.zip
Revert "allow admin to disable groups on personal page"
This reverts commit 28e1a9da6cd3bce3cc843727d54094db4969dd7b. See #5259
Diffstat (limited to 'settings')
-rw-r--r--settings/personal.php1
-rw-r--r--settings/templates/personal.php2
2 files changed, 0 insertions, 3 deletions
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']) {