aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-04-12 03:32:58 -0700
committerfriendica <info@friendica.com>2014-04-12 03:32:58 -0700
commitd0834c7e1394e1986b2b00e039125deff74d9e5e (patch)
tree2f63ecd2373dbb0cb7b40efe6d815fdc15b62932
parentc93353c0a363455faa496f01020ee78864333182 (diff)
parent163c83a9e5198100f89745b844fce5b786a79b7c (diff)
downloadvolse-hubzilla-d0834c7e1394e1986b2b00e039125deff74d9e5e.tar.gz
volse-hubzilla-d0834c7e1394e1986b2b00e039125deff74d9e5e.tar.bz2
volse-hubzilla-d0834c7e1394e1986b2b00e039125deff74d9e5e.zip
Merge https://github.com/friendica/red into pending_merge
-rw-r--r--include/identity.php26
1 files changed, 13 insertions, 13 deletions
diff --git a/include/identity.php b/include/identity.php
index ad787c22c..66e572866 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -994,32 +994,32 @@ function advanced_profile(&$a) {
if($a->profile['religion']) $profile['religion'] = array( t('Religion:'), $a->profile['religion']);
- if($txt = bbcode($a->profile['about'])) $profile['about'] = array( t('About:'), $txt );
+ if($txt = prepare_text($a->profile['about'])) $profile['about'] = array( t('About:'), $txt );
- if($txt = bbcode($a->profile['interest'])) $profile['interest'] = array( t('Hobbies/Interests:'), $txt);
+ if($txt = prepare_text($a->profile['interest'])) $profile['interest'] = array( t('Hobbies/Interests:'), $txt);
- if($txt = bbcode($a->profile['likes'])) $profile['likes'] = array( t('Likes:'), $txt);
+ if($txt = prepare_text($a->profile['likes'])) $profile['likes'] = array( t('Likes:'), $txt);
- if($txt = bbcode($a->profile['dislikes'])) $profile['dislikes'] = array( t('Dislikes:'), $txt);
+ if($txt = prepare_text($a->profile['dislikes'])) $profile['dislikes'] = array( t('Dislikes:'), $txt);
- if($txt = bbcode($a->profile['contact'])) $profile['contact'] = array( t('Contact information and Social Networks:'), $txt);
+ if($txt = prepare_text($a->profile['contact'])) $profile['contact'] = array( t('Contact information and Social Networks:'), $txt);
- if($txt = bbcode($a->profile['channels'])) $profile['channels'] = array( t('My other channels:'), $txt);
+ if($txt = prepare_text($a->profile['channels'])) $profile['channels'] = array( t('My other channels:'), $txt);
- if($txt = bbcode($a->profile['music'])) $profile['music'] = array( t('Musical interests:'), $txt);
+ if($txt = prepare_text($a->profile['music'])) $profile['music'] = array( t('Musical interests:'), $txt);
- if($txt = bbcode($a->profile['book'])) $profile['book'] = array( t('Books, literature:'), $txt);
+ if($txt = prepare_text($a->profile['book'])) $profile['book'] = array( t('Books, literature:'), $txt);
- if($txt = bbcode($a->profile['tv'])) $profile['tv'] = array( t('Television:'), $txt);
+ if($txt = prepare_text($a->profile['tv'])) $profile['tv'] = array( t('Television:'), $txt);
- if($txt = bbcode($a->profile['film'])) $profile['film'] = array( t('Film/dance/culture/entertainment:'), $txt);
+ if($txt = prepare_text($a->profile['film'])) $profile['film'] = array( t('Film/dance/culture/entertainment:'), $txt);
- if($txt = bbcode($a->profile['romance'])) $profile['romance'] = array( t('Love/Romance:'), $txt);
+ if($txt = prepare_text($a->profile['romance'])) $profile['romance'] = array( t('Love/Romance:'), $txt);
- if($txt = bbcode($a->profile['work'])) $profile['work'] = array( t('Work/employment:'), $txt);
+ if($txt = prepare_text($a->profile['work'])) $profile['work'] = array( t('Work/employment:'), $txt);
- if($txt = bbcode($a->profile['education'])) $profile['education'] = array( t('School/education:'), $txt );
+ if($txt = prepare_text($a->profile['education'])) $profile['education'] = array( t('School/education:'), $txt );
$things = get_things($a->profile['profile_guid'],$a->profile['profile_uid']);