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

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

View file

@ -75,9 +75,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();

View file

@ -81,7 +81,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']);

View file

@ -66,7 +66,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