diff options
| author | friendica <info@friendica.com> | 2015-01-13 18:07:49 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-01-13 18:07:49 -0800 |
| commit | 111bbe65d9f671f598b68da63d74555d68973358 (patch) | |
| tree | bb081ac8acd5a3245e7022f64589bbf5d3c0180b /include/identity.php | |
| parent | e528483d8150b1495e96de5309ed383a5fd6e09b (diff) | |
| parent | 47a2668b30de34f1f08983ba485a630a89a9dd1e (diff) | |
| download | volse-hubzilla-111bbe65d9f671f598b68da63d74555d68973358.tar.gz volse-hubzilla-111bbe65d9f671f598b68da63d74555d68973358.tar.bz2 volse-hubzilla-111bbe65d9f671f598b68da63d74555d68973358.zip | |
Merge branch 'moretagging' of git://github.com/pafcu/red into pafcu-moretagging
Conflicts:
mod/profiles.php
Diffstat (limited to 'include/identity.php')
| -rw-r--r-- | include/identity.php | 14 |
1 files changed, 1 insertions, 13 deletions
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); |