aboutsummaryrefslogtreecommitdiffstats
path: root/include/identity.php
diff options
context:
space:
mode:
authorEiner von Vielen <tomwie@users.sourceforge.net>2015-01-14 22:49:16 +0100
committerEiner von Vielen <tomwie@users.sourceforge.net>2015-01-14 22:49:16 +0100
commitdfab2416926631b7b08c6c89b62528ca2520f130 (patch)
tree6c76af9d656eec6e74ed6c3c05d7ccc2b6ef5e48 /include/identity.php
parent09129cbe5f7e8cb331b68469b74438464960af0b (diff)
parent7090b58f68251b8c4b39332f2ea051e95ead3df3 (diff)
downloadvolse-hubzilla-dfab2416926631b7b08c6c89b62528ca2520f130.tar.gz
volse-hubzilla-dfab2416926631b7b08c6c89b62528ca2520f130.tar.bz2
volse-hubzilla-dfab2416926631b7b08c6c89b62528ca2520f130.zip
Merge remote-tracking branch 'upstream/master' into toc
Diffstat (limited to 'include/identity.php')
-rw-r--r--include/identity.php14
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);