X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FGroup.php;h=1640cb87b1aa63471c30e2bc40e292600e0b7294;hb=ced4911c4ab268c9e502a3c3e1aa43ebda837044;hp=e313842e4143677afceb1f143dddb18eff3a0c31;hpb=756a4f111163195eb46442d86b915d6676aa0935;p=friendica.git diff --git a/src/Model/Group.php b/src/Model/Group.php index e313842e41..1640cb87b1 100644 --- a/src/Model/Group.php +++ b/src/Model/Group.php @@ -4,9 +4,13 @@ */ namespace Friendica\Model; +use Friendica\BaseModule; use Friendica\BaseObject; use Friendica\Core\L10n; +use Friendica\Core\Logger; +use Friendica\Core\Renderer; use Friendica\Database\DBA; +use Friendica\Util\Security; require_once 'boot.php'; require_once 'include/dba.php'; @@ -323,13 +327,13 @@ class Group extends BaseObject 'selected' => $gid == $group['id'] ? 'true' : '' ]; } - logger('groups: ' . print_r($display_groups, true)); + Logger::log('groups: ' . print_r($display_groups, true)); if ($label == '') { $label = L10n::t('Default privacy group for new contacts'); } - $o = replace_macros(get_markup_template('group_selection.tpl'), [ + $o = Renderer::replaceMacros(Renderer::getMarkupTemplate('group_selection.tpl'), [ '$label' => $label, '$groups' => $display_groups ]); @@ -396,8 +400,13 @@ class Group extends BaseObject ]; } - $tpl = get_markup_template('group_side.tpl'); - $o = replace_macros($tpl, [ + // Don't show the groups when there is only one + if (count($display_groups) <= 2) { + return ''; + } + + $tpl = Renderer::getMarkupTemplate('group_side.tpl'); + $o = Renderer::replaceMacros($tpl, [ '$add' => L10n::t('add'), '$title' => L10n::t('Groups'), '$groups' => $display_groups, @@ -409,7 +418,7 @@ class Group extends BaseObject '$createtext' => L10n::t('Create a new group'), '$creategroup' => L10n::t('Group Name: '), '$editgroupstext' => L10n::t('Edit groups'), - '$form_security_token' => get_form_security_token('group_edit'), + '$form_security_token' => BaseModule::getFormSecurityToken('group_edit'), ]);