Revert "allow admin to disable groups on personal page"

This reverts commit 28e1a9da6cd3bce3cc843727d54094db4969dd7b.

See #5259

diff --git a/config/config.sample.php b/config/config.sample.php
index 3ea898406d788872a1b5cd3bd31115f5e028d330..27499825c64fa0e4026bc155191b551b2884f595 100644 (file)
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -1541,9 +1541,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 df639c190c5e8cd2933a963d6adc6d80d2747e68..11fca3c525692f5635129685f4428aa13dc4accd 100644 (file)
--- 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 43e9d4010517fa0b4fdf3b53f1298b26d587890e..6604ebe43d14e0caeab04944e708dd4e137431c4 100644 (file)
--- 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']) {