Merge branch '2019.01-rc' into bug/6334-escape-get-app

2019-01-06 16:38:48 -05:00
parent b3f8a24819 4bf2701912
commit e447375cdd
27 changed files with 136 additions and 72 deletions
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -514,6 +514,10 @@ class Profile
 			$p['address'] = $p['location'];
 		}

+		if (isset($p['address'])) {
+			$p['address'] = BBCode::convert($p['address']);
+		}
+
 		if (isset($p['photo'])) {
 			$p['photo'] = ProxyUtils::proxifyUrl($p['photo'], false, ProxyUtils::SIZE_SMALL);
 		}