diff options
| author | Michael Vogel <icarus@dabo.de> | 2012-04-11 19:35:51 +0200 |
|---|---|---|
| committer | Michael Vogel <icarus@dabo.de> | 2012-04-11 19:35:51 +0200 |
| commit | ee714daf4d33f8258e1301438423fc10a3bdc916 (patch) | |
| tree | e3da18226db88c42819e2f29b67763581eb1c293 /mod/contacts.php | |
| parent | c88c2515e43f7a446a9b358fb657290a8a6c847a (diff) | |
| parent | a1d5026abf129fc520327881a293d17c1ab21eff (diff) | |
| download | volse-hubzilla-ee714daf4d33f8258e1301438423fc10a3bdc916.tar.gz volse-hubzilla-ee714daf4d33f8258e1301438423fc10a3bdc916.tar.bz2 volse-hubzilla-ee714daf4d33f8258e1301438423fc10a3bdc916.zip | |
Merge commit 'upstream/master'
Diffstat (limited to 'mod/contacts.php')
| -rw-r--r-- | mod/contacts.php | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/mod/contacts.php b/mod/contacts.php index 8aa51d00a..9d29d4bd1 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -85,7 +85,7 @@ function contacts_post(&$a) { if($priority > 5 || $priority < 0) $priority = 0; - $info = escape_tags(trim($_POST['info'])); + $info = fix_mce_lf(escape_tags(trim($_POST['info']))); $r = q("UPDATE `contact` SET `profile-id` = %d, `priority` = %d , `info` = '%s', `hidden` = %d WHERE `id` = %d AND `uid` = %d LIMIT 1", @@ -232,8 +232,14 @@ function contacts_content(&$a) { $contact_id = $a->data['contact']['id']; $contact = $a->data['contact']; - $tpl = get_markup_template('contact_head.tpl'); - $a->page['htmlhead'] .= replace_macros($tpl, array('$baseurl' => $a->get_baseurl(true))); + $editselect = 'exact'; + if(intval(get_pconfig(local_user(),'system','plaintext'))) + $editselect = 'none'; + + $a->page['htmlhead'] .= replace_macros(get_markup_template('contact_head.tpl'), array( + '$baseurl' => $a->get_baseurl(true), + '$editselect' => $editselect, + )); require_once('include/contact_selectors.php'); |