bitPickups/friendica_2021.01_tupambae_shared_hosting
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into 1510-diaspora-privacy

Browse source
This commit is contained in:
Michael Vogel 2015-10-06 07:41:09 +02:00
commit eefedc019b
8 changed files with 42 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mod/follow.php
View file

@ -105,7 +105,7 @@ function follow_content(&$a) {
'$request' => $request,
'$location' => bbcode($r[0]["location"]),
'$location_label' => t("Location:"),
'$about' => proxy_parse_html(bbcode($r[0]["about"], false, false)),
'$about' => bbcode($r[0]["about"], false, false),
'$about_label' => t("About:"),
'$keywords' => $r[0]["keywords"],
'$keywords_label' => t("Tags:")