aboutsummaryrefslogtreecommitdiffstats
path: root/include/zot.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-01-06 02:37:06 -0800
committerfriendica <info@friendica.com>2014-01-06 02:37:06 -0800
commit196b3022bd8759428d04d8d3bcf10c27d7c3b329 (patch)
treeba785f204e8616af5751d7303d3357c75b9d30bc /include/zot.php
parent0c85c9748096d625ae9baa29fb9aad48bab3a208 (diff)
parentae8a30273a6b787985d06fa776d1726d4427f9be (diff)
downloadvolse-hubzilla-196b3022bd8759428d04d8d3bcf10c27d7c3b329.tar.gz
volse-hubzilla-196b3022bd8759428d04d8d3bcf10c27d7c3b329.tar.bz2
volse-hubzilla-196b3022bd8759428d04d8d3bcf10c27d7c3b329.zip
Merge branch 'master' into movejs
Conflicts: version.inc
Diffstat (limited to 'include/zot.php')
-rw-r--r--include/zot.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/zot.php b/include/zot.php
index 97c9c4a36..168ccaaa5 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -1726,7 +1726,7 @@ function import_directory_profile($hash,$profile,$addr,$ud_flags = 1, $suppress_
else {
$update = true;
logger('import_directory_profile: new profile');
- $x = q("insert into xprof (xprof_hash, xprof_desc, xprof_dob, xprof_age, xprof_gender, xprof_marital, xprof_sexual, xprof_locale, xprof_region, xprof_postcode, xprof_country, xrpof_about, xprof_homepage, xprof_hometown, xprof_keywords) values ('%s', '%s', '%s', %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s') ",
+ $x = q("insert into xprof (xprof_hash, xprof_desc, xprof_dob, xprof_age, xprof_gender, xprof_marital, xprof_sexual, xprof_locale, xprof_region, xprof_postcode, xprof_country, xprof_about, xprof_homepage, xprof_hometown, xprof_keywords) values ('%s', '%s', '%s', %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s') ",
dbesc($arr['xprof_hash']),
dbesc($arr['xprof_desc']),
dbesc($arr['xprof_dob']),