aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-02-20 21:30:31 -0800
committerfriendica <info@friendica.com>2015-02-20 21:30:31 -0800
commit0faffe616017e3e363331bbdd18d49fb248bb82c (patch)
treee8c03eef56ee93a2fe7445f132e154e56634349f
parent6c77550c298c2189878f3b7f132331314edbde66 (diff)
parentffd47e6b9544c4ef717fdd545563831df84bf93b (diff)
downloadvolse-hubzilla-0faffe616017e3e363331bbdd18d49fb248bb82c.tar.gz
volse-hubzilla-0faffe616017e3e363331bbdd18d49fb248bb82c.tar.bz2
volse-hubzilla-0faffe616017e3e363331bbdd18d49fb248bb82c.zip
Merge https://github.com/friendica/red into pending_merge
-rw-r--r--include/zot.php13
1 files changed, 7 insertions, 6 deletions
diff --git a/include/zot.php b/include/zot.php
index 98b54a04c..0d8fe8714 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -2244,10 +2244,11 @@ function import_directory_profile($hash,$profile,$addr,$ud_flags = UPDATE_FLAGS_
dbesc($hash)
);
- $age = intval($arr['xprof_age']);
- if($age > 150)
- $age = 150;
-
+ if($arr['xprof_age'] > 150)
+ $arr['xprof_age'] = 150;
+ if($arr['xprof_age'] < 0)
+ $arr['xprof_age'] = 0;
+
if($r) {
$update = false;
foreach($r[0] as $k => $v) {
@@ -2276,7 +2277,7 @@ function import_directory_profile($hash,$profile,$addr,$ud_flags = UPDATE_FLAGS_
where xprof_hash = '%s'",
dbesc($arr['xprof_desc']),
dbesc($arr['xprof_dob']),
- $age,
+ intval($arr['xprof_age']),
dbesc($arr['xprof_gender']),
dbesc($arr['xprof_marital']),
dbesc($arr['xprof_sexual']),
@@ -2299,7 +2300,7 @@ function import_directory_profile($hash,$profile,$addr,$ud_flags = UPDATE_FLAGS_
dbesc($arr['xprof_hash']),
dbesc($arr['xprof_desc']),
dbesc($arr['xprof_dob']),
- $age,
+ intval($arr['xprof_age']),
dbesc($arr['xprof_gender']),
dbesc($arr['xprof_marital']),
dbesc($arr['xprof_sexual']),