aboutsummaryrefslogtreecommitdiffstats
path: root/mod/profiles.php
diff options
context:
space:
mode:
authorTobias Diekershoff <tobias.diekershoff@gmx.net>2011-03-16 06:52:33 +0100
committerTobias Diekershoff <tobias.diekershoff@gmx.net>2011-03-16 06:52:33 +0100
commitc43f647049c78b594c90e95d06d12f29f300d5d3 (patch)
treea6b02ad763a5d539158721edbe8ca73e158d8ca4 /mod/profiles.php
parenta2ee5ebe427522228dc03dc81da11f348a399c4d (diff)
parente2ea341094c53e78ae7473a83d2b6c85b1cde4eb (diff)
downloadvolse-hubzilla-c43f647049c78b594c90e95d06d12f29f300d5d3.tar.gz
volse-hubzilla-c43f647049c78b594c90e95d06d12f29f300d5d3.tar.bz2
volse-hubzilla-c43f647049c78b594c90e95d06d12f29f300d5d3.zip
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'mod/profiles.php')
-rw-r--r--mod/profiles.php12
1 files changed, 8 insertions, 4 deletions
diff --git a/mod/profiles.php b/mod/profiles.php
index 409999a3e..434f58adf 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -55,7 +55,8 @@ function profiles_post(&$a) {
$region = notags(trim($_POST['region']));
$postal_code = notags(trim($_POST['postal_code']));
$country_name = notags(trim($_POST['country_name']));
- $keywords = notags(trim($_POST['keywords']));
+ $pub_keywords = notags(trim($_POST['pub_keywords']));
+ $prv_keywords = notags(trim($_POST['prv_keywords']));
$marital = notags(trim($_POST['marital']));
if($marital != $orig[0]['marital'])
$maritalchanged = true;
@@ -147,7 +148,8 @@ function profiles_post(&$a) {
`homepage` = '%s',
`politic` = '%s',
`religion` = '%s',
- `keywords` = '%s',
+ `pub_keywords` = '%s',
+ `prv_keywords` = '%s',
`about` = '%s',
`interest` = '%s',
`contact` = '%s',
@@ -176,7 +178,8 @@ function profiles_post(&$a) {
dbesc($homepage),
dbesc($politic),
dbesc($religion),
- dbesc($keywords),
+ dbesc($pub_keywords),
+ dbesc($prv_keywords),
dbesc($about),
dbesc($interest),
dbesc($contact),
@@ -383,7 +386,8 @@ function profiles_content(&$a) {
'$homepage' => $r[0]['homepage'],
'$politic' => $r[0]['politic'],
'$religion' => $r[0]['religion'],
- '$keywords' => $r[0]['keywords'],
+ '$pub_keywords' => $r[0]['pub_keywords'],
+ '$prv_keywords' => $r[0]['prv_keywords'],
'$music' => $r[0]['music'],
'$book' => $r[0]['book'],
'$tv' => $r[0]['tv'],