harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert to prepare_text, use bbcode only for with

Browse Source
This commit is contained in:
Thomas Willingham
2014-04-12 00:08:50 +01:00
parent 8b39b5ae4e
commit a82b1fe590
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
include/identity.php
View File

@@ -870,7 +870,7 @@ logger('online: ' . $profile['online']);
function get_events() { function get_events() {
require_once('include/bbcode.php'); require_once('include/prepare_text.php');
$a = get_app(); $a = get_app();
@@ -909,7 +909,7 @@ logger('online: ' . $profile['online']);
$md = datetime_convert('UTC','UTC',$rr['start'],'Y/m'); $md = datetime_convert('UTC','UTC',$rr['start'],'Y/m');
$md .= "/#link-".$rr['id']; $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) if(! $title)
$title = t('[No description]'); $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($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']); $things = get_things($a->profile['profile_guid'],$a->profile['profile_uid']);