diff options
| author | Thomas Willingham <beardyunixer@beardyunixer.com> | 2014-09-09 21:32:25 +0100 |
|---|---|---|
| committer | Thomas Willingham <beardyunixer@beardyunixer.com> | 2014-09-09 21:32:25 +0100 |
| commit | ec4f30c3f672bbfc57bee8db0aaa0cf002fe8687 (patch) | |
| tree | cf1aa37d881f2ce3cb844bbcd5c11c5999e96c66 /include/zot.php | |
| parent | 652ec8c3fcc956c1a5fc2adb7410e4c4a2ac6f90 (diff) | |
| parent | 409c89d629993b59eaafa8443ae9d0b5f0344c1f (diff) | |
| download | volse-hubzilla-ec4f30c3f672bbfc57bee8db0aaa0cf002fe8687.tar.gz volse-hubzilla-ec4f30c3f672bbfc57bee8db0aaa0cf002fe8687.tar.bz2 volse-hubzilla-ec4f30c3f672bbfc57bee8db0aaa0cf002fe8687.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/zot.php')
| -rw-r--r-- | include/zot.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/zot.php b/include/zot.php index 6ccee8c39..f5099df8c 100644 --- a/include/zot.php +++ b/include/zot.php @@ -384,7 +384,7 @@ function zot_refresh($them,$channel = null, $force = false) { $next_birthday = datetime_convert('UTC','UTC',$j['profile']['next_birthday']); } else { - $next_birthday = '0000-00-00 00:00:00'; + $next_birthday = NULL_DATE; } if($r) { @@ -1024,7 +1024,7 @@ function import_xchan($arr,$ud_flags = UPDATE_FLAGS_UPDATED, $ud_arr = null) { $realm = get_directory_realm(); if(array_key_exists('site',$arr) && array_key_exists('realm',$arr['site']) - && (strpos($arr['site']['realm'],$realm) !== false)) + && (strpos($arr['site']['realm'],$realm) === false)) $other_realm = true; if($dirmode != DIRECTORY_MODE_NORMAL) { |