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

Merge pull request #8261 from MrPetovan/task/8251-use-about-for-pdesc

Browse source 
Use profile.about for profile description
This commit is contained in:
Michael Vogel 2020-02-10 23:36:59 +01:00 • committed by GitHub
commit e80d68ba53
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
29 changed files with 53 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -89,7 +89,7 @@ class Index extends BaseSettings
$namechanged = $profile['name'] != $name;
$pdesc = Strings::escapeTags(trim($_POST['pdesc']));
$about = Strings::escapeTags(trim($_POST['about']));
$address = Strings::escapeTags(trim($_POST['address']));
$locality = Strings::escapeTags(trim($_POST['locality']));
$region = Strings::escapeTags(trim($_POST['region']));
@ -121,7 +121,7 @@ class Index extends BaseSettings
'profile',
[
'name' => $name,
'pdesc' => $pdesc,
'about' => $about,
'dob' => $dob,
'address' => $address,
'locality' => $locality,
@ -273,7 +273,7 @@ class Index extends BaseSettings
'$baseurl' => DI::baseUrl()->get(true),
'$nickname' => $a->user['nickname'],
'$name' => ['name', DI::l10n()->t('Display name:'), $profile['name']],
'$pdesc' => ['pdesc', DI::l10n()->t('Title/Description:'), $profile['pdesc']],
'$about' => ['about', DI::l10n()->t('Description:'), $profile['about']],
'$dob' => Temporal::getDateofBirthField($profile['dob'], $a->user['timezone']),
'$hide_friends' => $hide_friends,
'$address' => ['address', DI::l10n()->t('Street Address:'), $profile['address']],