Merge remote branch 'upstream/master'

[friendica.git] / include / profile_advanced.php

diff --git a/include/profile_advanced.php b/include/profile_advanced.php
old mode 100755 (executable)
new mode 100644 (file)
index ccecb95..bb9850c
--- a/include/profile_advanced.php
+++ b/include/profile_advanced.php
@@ -2,7 +2,7 @@
 
 function advanced_profile(&$a) {
 
-       $o .= '';
+       $o = '';
 
        $o .= '<h2>' . t('Profile') . '</h2>';
 
@@ -44,6 +44,8 @@ function advanced_profile(&$a) {
 
                if($a->profile['homepage']) $profile['homepage'] = array( t('Homepage:'), linkify($a->profile['homepage']) );
 
+               if($a->profile['pub_keywords']) $profile['pub_keywords'] = array( t('Tags:'), $a->profile['pub_keywords']);
+
                if($a->profile['politic']) $profile['politic'] = array( t('Political Views:'), $a->profile['politic']);
 
                if($a->profile['religion']) $profile['religion'] = array( t('Religion:'), $a->profile['religion']);
@@ -67,13 +69,12 @@ function advanced_profile(&$a) {
                if($txt = prepare_text($a->profile['work'])) $profile['work'] = array( t('Work/employment:'), $txt);
 
                if($txt = prepare_text($a->profile['education'])) $profile['education'] = array( t('School/education:'), $txt );
-       }
-
-               
-       return replace_macros($tpl, array(
-               '$title' => t('Profile'),
-               '$profile' => $profile,
-       ));
 
+        return replace_macros($tpl, array(
+            '$title' => t('Profile'),
+            '$profile' => $profile,
+        ));
+    }
 
+       return '';
 }