Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-24 11:50:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move ProfileField::selectByContactId() and ProfileField::selectByUserId()

Browse source
This commit is contained in:
Philipp 2021-10-08 20:01:09 +02:00
parent a9981c792e
commit 6f692b857b
No known key found for this signature in database
GPG key ID: 24A7501396EB5432
5 changed files with 49 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Module/Profile/Profile.php
View file

@ -213,9 +213,9 @@ class Profile extends BaseProfile
$contact_id = $view_as_contact_id ?: $remote_contact_id ?: 0;
if ($is_owner && $contact_id === 0) {
$profile_fields = DI::profileField()->selectByUserId($profile['uid']);
$profile_fields = DI::profileFieldNew()->selectByUserId($profile['uid']);
} else {
$profile_fields = DI::profileField()->selectByContactId($contact_id, $profile['uid']);
$profile_fields = DI::profileFieldNew()->selectByContactId($contact_id, $profile['uid']);
}
foreach ($profile_fields as $profile_field) {

4
src/Module/Settings/Profile/Index.php
View file

@ -100,7 +100,7 @@ class Index extends BaseSettings
$homepage = 'http://' . $homepage;
}
$profileFields = DI::profileField()->selectByUserId(local_user());
$profileFields = DI::profileFieldNew()->selectByUserId(local_user());
$profileFields = DI::profileField()->updateCollectionFromForm(
local_user(),
@ -159,7 +159,7 @@ class Index extends BaseSettings
$custom_fields = [];
$profileFields = DI::profileField()->selectByUserId(local_user());
$profileFields = DI::profileFieldNew()->selectByUserId(local_user());
foreach ($profileFields as $profileField) {
/** @var ProfileField $profileField */
$defaultPermissions = $profileField->permissionSet->withAllowedContacts(