From 93735df2c78b249d5735834c190dc91bad336172 Mon Sep 17 00:00:00 2001 From: Stefan Parviainen Date: Tue, 13 Jan 2015 17:54:40 +0100 Subject: Allow tags in mail, many profile fields, and admin info --- include/identity.php | 14 +------------- include/text.php | 2 +- 2 files changed, 2 insertions(+), 14 deletions(-) (limited to 'include') diff --git a/include/identity.php b/include/identity.php index 2f400520f..d98f39cb7 100644 --- a/include/identity.php +++ b/include/identity.php @@ -1205,21 +1205,9 @@ function advanced_profile(&$a) { if($txt = prepare_text($a->profile['dislikes'])) $profile['dislikes'] = array( t('Dislikes:'), $txt); - if($txt = prepare_text($a->profile['contact'])) $profile['contact'] = array( t('Contact information and Social Networks:'), $txt); - // Support tags in the other channels field (probably want to restrict it to channels only?) - $txt = $a->profile['channels']; - $matches = get_tags($txt); - $access_tag = ''; - $str_tags = ''; - foreach($matches as $m) { - $success = handle_tag($a, $txt, $access_tag, $str_tags, $a->profile_uid, $m); // Use uid of the profile maker - } - - if($txt = prepare_text($txt)) { - $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 = prepare_text($a->profile['music'])) $profile['music'] = array( t('Musical interests:'), $txt); diff --git a/include/text.php b/include/text.php index 035c092a6..6b579e35c 100644 --- a/include/text.php +++ b/include/text.php @@ -2351,7 +2351,7 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag) { return array('replaced' => $replaced, 'termtype' => $termtype, 'term' => $newname, 'url' => $url, 'contact' => $r[0]); } -function linkify_tags($a, &$body, $uid, $profile_uid) { +function linkify_tags($a, &$body, $uid) { $str_tags = ''; $tagged = array(); $result = array(); -- cgit v1.2.3