diff options
| author | Einer von Vielen <tomwie@users.sourceforge.net> | 2015-01-14 22:49:16 +0100 |
|---|---|---|
| committer | Einer von Vielen <tomwie@users.sourceforge.net> | 2015-01-14 22:49:16 +0100 |
| commit | dfab2416926631b7b08c6c89b62528ca2520f130 (patch) | |
| tree | 6c76af9d656eec6e74ed6c3c05d7ccc2b6ef5e48 /mod/profiles.php | |
| parent | 09129cbe5f7e8cb331b68469b74438464960af0b (diff) | |
| parent | 7090b58f68251b8c4b39332f2ea051e95ead3df3 (diff) | |
| download | volse-hubzilla-dfab2416926631b7b08c6c89b62528ca2520f130.tar.gz volse-hubzilla-dfab2416926631b7b08c6c89b62528ca2520f130.tar.bz2 volse-hubzilla-dfab2416926631b7b08c6c89b62528ca2520f130.zip | |
Merge remote-tracking branch 'upstream/master' into toc
Diffstat (limited to 'mod/profiles.php')
| -rw-r--r-- | mod/profiles.php | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/mod/profiles.php b/mod/profiles.php index fa6a6e35c..ef5f6b379 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -296,7 +296,24 @@ function profiles_post(&$a) { $work = fix_mce_lf(escape_tags(trim($_POST['work']))); $education = fix_mce_lf(escape_tags(trim($_POST['education']))); - $hide_friends = (($_POST['hide_friends'] == 1) ? 1: 0); + $hide_friends = ((intval($_POST['hide_friends'])) ? 1: 0); + + require_once('include/text.php'); + linkify_tags($a, $likes, local_user()); + linkify_tags($a, $dislikes, local_user()); + linkify_tags($a, $about, local_user()); + linkify_tags($a, $interest, local_user()); + linkify_tags($a, $interest, local_user()); + linkify_tags($a, $contact, local_user()); + linkify_tags($a, $channels, local_user()); + linkify_tags($a, $music, local_user()); + linkify_tags($a, $book, local_user()); + linkify_tags($a, $tv, local_user()); + linkify_tags($a, $film, local_user()); + linkify_tags($a, $romance, local_user()); + linkify_tags($a, $work, local_user()); + linkify_tags($a, $education, local_user()); + $with = ((x($_POST,'with')) ? escape_tags(trim($_POST['with'])) : ''); @@ -605,7 +622,7 @@ function profiles_content(&$a) { $opt_tpl = get_markup_template("profile_hide_friends.tpl"); $hide_friends = replace_macros($opt_tpl,array('$field' => array( - 'hide-friends', + 'hide_friends', t('Hide your contact/friend list from viewers of this profile?'), $r[0]['hide_friends'], '', |