- {{$network}}
- {{$network_link nofilter}}
diff --git a/mod/cal.php b/mod/cal.php
index 9e32b87d6..835291778 100644
--- a/mod/cal.php
+++ b/mod/cal.php
@@ -59,9 +59,9 @@ function cal_init(App $a)
$vcard_widget = Renderer::replaceMacros($tpl, [
'$name' => $profile['name'],
'$photo' => $profile['photo'],
- '$addr' => (($profile['addr'] != "") ? $profile['addr'] : ""),
+ '$addr' => $profile['addr'] ?: '',
'$account_type' => $account_type,
- '$pdesc' => (($profile['pdesc'] != "") ? $profile['pdesc'] : ""),
+ '$about' => $profile['about'] ?: '',
]);
$cal_widget = Widget\CalendarExport::getHTML();
diff --git a/mod/photos.php b/mod/photos.php
index 0733bbc96..13fa855c9 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -65,7 +65,7 @@ function photos_init(App $a) {
'$photo' => $profile['photo'],
'$addr' => $profile['addr'] ?? '',
'$account_type' => $account_type,
- '$pdesc' => $profile['pdesc'] ?? '',
+ '$about' => $profile['about'] ?? '',
]);
$albums = Photo::getAlbums($a->data['user']['uid']);
diff --git a/mod/videos.php b/mod/videos.php
index 36ddef681..b8119a686 100644
--- a/mod/videos.php
+++ b/mod/videos.php
@@ -50,7 +50,7 @@ function videos_init(App $a)
'$photo' => $profile['photo'],
'$addr' => $profile['addr'] ?? '',
'$account_type' => $account_type,
- '$pdesc' => $profile['pdesc'] ?? '',
+ '$about' => $profile['about'] ?? '',
]);
// If not there, create 'aside' empty
diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 051f94d3e..02220750e 100644
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -722,7 +722,7 @@ class Contact
return;
}
- $fields = ['name', 'photo', 'thumb', 'pdesc' => 'about', 'address', 'locality', 'region',
+ $fields = ['name', 'photo', 'thumb', 'about', 'address', 'locality', 'region',
'country-name', 'pub_keywords', 'xmpp', 'net-publish'];
$profile = DBA::selectFirst('profile', $fields, ['uid' => $uid]);
if (!DBA::isResult($profile)) {
diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index 28491fb5f..b06d951a6 100644
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -899,7 +899,7 @@ class Profile
WHERE $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed`
AND ((`profile`.`name` LIKE ?) OR
(`user`.`nickname` LIKE ?) OR
- (`profile`.`pdesc` LIKE ?) OR
+ (`profile`.`about` LIKE ?) OR
(`profile`.`locality` LIKE ?) OR
(`profile`.`region` LIKE ?) OR
(`profile`.`country-name` LIKE ?) OR
@@ -934,7 +934,7 @@ class Profile
WHERE $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` AND `contact`.`self`
AND ((`profile`.`name` LIKE ?) OR
(`user`.`nickname` LIKE ?) OR
- (`profile`.`pdesc` LIKE ?) OR
+ (`profile`.`about` LIKE ?) OR
(`profile`.`locality` LIKE ?) OR
(`profile`.`region` LIKE ?) OR
(`profile`.`country-name` LIKE ?) OR
diff --git a/src/Module/Api/Friendica/Profile/Show.php b/src/Module/Api/Friendica/Profile/Show.php
index 2c50c53d5..c739ec694 100644
--- a/src/Module/Api/Friendica/Profile/Show.php
+++ b/src/Module/Api/Friendica/Profile/Show.php
@@ -77,7 +77,7 @@ class Show extends BaseApi
'profile_thumb' => $profile_row['thumb'],
'publish' => $profile_row['publish'] ? true : false,
'net_publish' => $profile_row['net-publish'] ? true : false,
- 'description' => $profile_row['pdesc'],
+ 'description' => $profile_row['about'],
'date_of_birth' => $profile_row['dob'],
'address' => $profile_row['address'],
'city' => $profile_row['locality'],
diff --git a/src/Module/Directory.php b/src/Module/Directory.php
index 8335fb0cd..56ec46303 100644
--- a/src/Module/Directory.php
+++ b/src/Module/Directory.php
@@ -105,7 +105,7 @@ class Directory extends BaseModule
$profile_link = $contact['profile_url'];
- $pdesc = (($contact['pdesc']) ? $contact['pdesc'] . '
' : '');
+ $about = (($contact['about']) ? $contact['about'] . '
' : '');
$details = '';
if (strlen($contact['locality'])) {
@@ -157,7 +157,7 @@ class Directory extends BaseModule
'profile' => $profile,
'location' => $location_e,
'tags' => $contact['pub_keywords'],
- 'pdesc' => $pdesc,
+ 'about' => $about,
'homepage' => $homepage,
'photo_menu' => $photo_menu,
diff --git a/src/Module/NoScrape.php b/src/Module/NoScrape.php
index 53b3fc4e3..fa7cd9c5b 100644
--- a/src/Module/NoScrape.php
+++ b/src/Module/NoScrape.php
@@ -112,7 +112,7 @@ class NoScrape extends BaseModule
$json_info['last-activity'] = date('o-W', $last_active);
//These are optional fields.
- $profile_fields = ['pdesc', 'locality', 'region', 'postal-code', 'country-name'];
+ $profile_fields = ['about', 'locality', 'region', 'postal-code', 'country-name'];
foreach ($profile_fields as $field) {
if (!empty($a->profile[$field])) {
$json_info["$field"] = $a->profile[$field];
diff --git a/src/Module/Profile/Profile.php b/src/Module/Profile/Profile.php
index 690f4ee97..b4bac371c 100644
--- a/src/Module/Profile/Profile.php
+++ b/src/Module/Profile/Profile.php
@@ -136,8 +136,8 @@ class Profile extends BaseProfile
}
}
- if ($a->profile['pdesc']) {
- $basic_fields += self::buildField('pdesc', DI::l10n()->t('Description:'), HTML::toLink($a->profile['pdesc']));
+ if ($a->profile['about']) {
+ $basic_fields += self::buildField('about', DI::l10n()->t('Description:'), BBCode::convert($a->profile['about']));
}
if ($a->profile['xmpp']) {
diff --git a/src/Module/Settings/Profile/Index.php b/src/Module/Settings/Profile/Index.php
index d8227d4ae..15a010e28 100644
--- a/src/Module/Settings/Profile/Index.php
+++ b/src/Module/Settings/Profile/Index.php
@@ -70,7 +70,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']));
@@ -102,7 +102,7 @@ class Index extends BaseSettings
'profile',
[
'name' => $name,
- 'pdesc' => $pdesc,
+ 'about' => $about,
'dob' => $dob,
'address' => $address,
'locality' => $locality,
@@ -254,7 +254,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']],
diff --git a/src/Repository/ProfileField.php b/src/Repository/ProfileField.php
index b1b16dcf1..a6399eba5 100644
--- a/src/Repository/ProfileField.php
+++ b/src/Repository/ProfileField.php
@@ -263,7 +263,7 @@ class ProfileField extends BaseRepository
'religion' => $this->l10n->t('Religious Views:'),
'likes' => $this->l10n->t('Likes:'),
'dislikes' => $this->l10n->t('Dislikes:'),
- 'about' => $this->l10n->t('About:'),
+ 'pdesc' => $this->l10n->t('Title/Description:'),
'summary' => $this->l10n->t('Summary'),
'music' => $this->l10n->t('Musical interests'),
'book' => $this->l10n->t('Books, literature'),
diff --git a/view/templates/profile/vcard.tpl b/view/templates/profile/vcard.tpl
index 826074a31..b8fc807fa 100644
--- a/view/templates/profile/vcard.tpl
+++ b/view/templates/profile/vcard.tpl
@@ -5,7 +5,7 @@
{{if $profile.addr}}