NULL_DATE is now a constant

This commit is contained in:
Michael 2017-02-27 23:37:15 +00:00
parent 86c6c48bd8
commit 0afb0c2ea4
21 changed files with 162 additions and 146 deletions

View file

@ -173,8 +173,8 @@ function cron_update_photo_albums() {
function cron_expire_and_remove_users() {
// expire any expired accounts
q("UPDATE user SET `account_expired` = 1 where `account_expired` = 0
AND `account_expires_on` != '0000-00-00 00:00:00'
AND `account_expires_on` < UTC_TIMESTAMP() ");
AND `account_expires_on` > '%s'
AND `account_expires_on` < UTC_TIMESTAMP()", dbesc(NULL_DATE));
// delete user and contact records for recently removed accounts
$r = q("SELECT * FROM `user` WHERE `account_removed` AND `account_expires_on` < UTC_TIMESTAMP() - INTERVAL 3 DAY");
@ -276,7 +276,7 @@ function cron_poll_contacts($argc, $argv) {
$xml = false;
if($manual_id)
$contact['last-update'] = '0000-00-00 00:00:00';
$contact['last-update'] = NULL_DATE;
if(in_array($contact['network'], array(NETWORK_DFRN, NETWORK_ZOT, NETWORK_OSTATUS)))
$contact['priority'] = 2;