Issue-6329: Prevent double encoding

This commit is contained in:
Michael 2018-12-26 11:21:42 +00:00
parent 7357de411d
commit f274357ad6
2 changed files with 3 additions and 5 deletions

View file

@ -512,10 +512,8 @@ class Profile
$p['about'] = BBCode::convert($p['about']);
}
if (isset($p['address'])) {
$p['address'] = BBCode::convert($p['address']);
} elseif (isset($p['location'])) {
$p['address'] = BBCode::convert($p['location']);
if (empty($p['address']) && !empty($p['location'])) {
$p['address'] = $p['location'];
}
if (isset($p['photo'])) {