From a82b1fe5902a7721d68aba27aad6f4bcb42854fa Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Sat, 12 Apr 2014 00:08:50 +0100 Subject: Revert to prepare_text, use bbcode only for with --- include/identity.php | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/include/identity.php b/include/identity.php index ad787c22c..7258d752b 100644 --- a/include/identity.php +++ b/include/identity.php @@ -870,7 +870,7 @@ logger('online: ' . $profile['online']); function get_events() { - require_once('include/bbcode.php'); + require_once('include/prepare_text.php'); $a = get_app(); @@ -909,7 +909,7 @@ logger('online: ' . $profile['online']); $md = datetime_convert('UTC','UTC',$rr['start'],'Y/m'); $md .= "/#link-".$rr['id']; - $title = substr(strip_tags(bbcode($rr['desc'])),0,32) . '... '; + $title = substr(strip_tags(prepare_text($rr['desc'])),0,32) . '... '; if(! $title) $title = t('[No description]'); @@ -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']); -- cgit v1.2.3 From 163c83a9e5198100f89745b844fce5b786a79b7c Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Sat, 12 Apr 2014 00:11:43 +0100 Subject: Ooops, replaced too many --- include/identity.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/identity.php b/include/identity.php index 7258d752b..66e572866 100644 --- a/include/identity.php +++ b/include/identity.php @@ -870,7 +870,7 @@ logger('online: ' . $profile['online']); function get_events() { - require_once('include/prepare_text.php'); + require_once('include/bbcode.php'); $a = get_app(); @@ -909,7 +909,7 @@ logger('online: ' . $profile['online']); $md = datetime_convert('UTC','UTC',$rr['start'],'Y/m'); $md .= "/#link-".$rr['id']; - $title = substr(strip_tags(prepare_text($rr['desc'])),0,32) . '... '; + $title = substr(strip_tags(bbcode($rr['desc'])),0,32) . '... '; if(! $title) $title = t('[No description]'); -- cgit v1.2.3