Skip to content

[stable12] Revert "allow admin to disable groups on personal page" #5385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 1 commit into from
Jun 13, 2017
Merged

[stable12] Revert "allow admin to disable groups on personal page" #5385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions config/config.sample.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1541,9 +1541,4 @@
*/
'gs.federation' => 'internal',

/**
* show group membership on the personal page
*/
'settings.personal.showGroupMembership' => true

);
1 change: 0 additions & 1 deletion settings/personal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,6 @@
$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']);
Expand Down
2 changes: 0 additions & 2 deletions settings/templates/personal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,15 +257,13 @@

<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>
<p>
<?php p(implode(', ', $_['groups'])); ?>
</p>
</div>
<?php endif; ?>

<?php
if($_['passwordChangeSupported']) {
Expand Down