mirror of
https://github.com/friendica/friendica
synced 2025-04-27 17:10:10 +00:00
Replace "forum" by "group" in the rest of the code
This commit is contained in:
parent
03bebf57c5
commit
3385147f25
59 changed files with 378 additions and 424 deletions
|
@ -188,7 +188,7 @@ class Conversations extends BaseProfile
|
|||
$condition = DBA::mergeConditions($condition, ["`received` >= ?", DateTimeFormat::convert($datequery2, 'UTC', $this->app->getTimeZone())]);
|
||||
}
|
||||
|
||||
// Does the profile page belong to a forum?
|
||||
// Does the profile page belong to a group?
|
||||
// If not then we can improve the performance with an additional condition
|
||||
if ($profile['account-type'] != User::ACCOUNT_TYPE_COMMUNITY) {
|
||||
$condition = DBA::mergeConditions($condition, ['contact-id' => $profile['id']]);
|
||||
|
|
|
@ -23,7 +23,7 @@ namespace Friendica\Module\Profile;
|
|||
|
||||
use Friendica\App;
|
||||
use Friendica\Content\Feature;
|
||||
use Friendica\Content\ForumManager;
|
||||
use Friendica\Content\GroupManager;
|
||||
use Friendica\Content\Nav;
|
||||
use Friendica\Content\Text\BBCode;
|
||||
use Friendica\Core\Config\Capability\IManageConfigValues;
|
||||
|
@ -254,12 +254,12 @@ class Profile extends BaseProfile
|
|||
);
|
||||
}
|
||||
|
||||
//show subscribed forum if it is enabled in the usersettings
|
||||
//show subscribed group if it is enabled in the usersettings
|
||||
if (Feature::isEnabled($profile['uid'], 'forumlist_profile')) {
|
||||
$custom_fields += self::buildField(
|
||||
'forumlist',
|
||||
$this->t('Forums:'),
|
||||
ForumManager::profileAdvanced($profile['uid'])
|
||||
'group_list',
|
||||
$this->t('Groups:'),
|
||||
GroupManager::profileAdvanced($profile['uid'])
|
||||
);
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue