X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FMsn%2Fmsn_waiting_message.php;h=707cd04389a6dc9d527fa40ffe798cb0a791d073;hb=fee9ddf84115bfa1062d7661fd439c5f8ddf985e;hp=d69520b40b4ccb8d3e9c46904da81c265b54bb8f;hpb=68ec3f855d84025a124b5a25736f9cef7badd8d6;p=quix0rs-gnu-social.git diff --git a/plugins/Msn/msn_waiting_message.php b/plugins/Msn/msn_waiting_message.php index d69520b40b..707cd04389 100644 --- a/plugins/Msn/msn_waiting_message.php +++ b/plugins/Msn/msn_waiting_message.php @@ -30,8 +30,8 @@ class Msn_waiting_message extends Memcached_DataObject { return array('id' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL, 'screenname' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL, 'message' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL, - 'created' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL, - 'claimed' => DB_DATAOBJECT_STR); + 'created' => DB_DATAOBJECT_TIME + DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL, + 'claimed' => DB_DATAOBJECT_TIME + DB_DATAOBJECT_STR); } /** @@ -86,8 +86,8 @@ class Msn_waiting_message extends Memcached_DataObject { if ($screenname) { if (is_array($screenname)) { // @fixme use safer escaping - $list = implode("','", array_map('addslashes', $transports)); - $wm->whereAdd("screename in ('$list')"); + $list = implode("','", array_map('addslashes', $screenname)); + $wm->whereAdd("screenname in ('$list')"); } else { $wm->screenname = $screenname; } @@ -100,9 +100,9 @@ class Msn_waiting_message extends Memcached_DataObject { $cnt = $wm->find(true); if ($cnt) { - # XXX: potential race condition - # can we force it to only update if claimed is still null - # (or old)? + // XXX: potential race condition + // can we force it to only update if claimed is still null + // (or old)? common_log(LOG_INFO, 'claiming msn waiting message id = ' . $wm->id); $orig = clone($wm); $wm->claimed = common_sql_now();