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

2015-10-06 07:41:09 +02:00
parent 901b95e935 b60cf21f8a
commit eefedc019b
8 changed files with 42 additions and 17 deletions
@@ -242,7 +242,7 @@ function notifications_content(&$a) {
 					'$fullname' => $rr['name'],
 					'$location' => bbcode($rr['glocation'], false, false),
 					'$location_label' => t('Location:'),
-					'$about' => proxy_parse_html(bbcode($rr['gabout'], false, false)),
+					'$about' => bbcode($rr['gabout'], false, false),
 					'$about_label' => t('About:'),
 					'$keywords' => $rr['gkeywords'],
 					'$keywords_label' => t('Tags:'),