projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of http://git.roojs.com:8081/Pman.Core
[Pman.Core]
/
Notify.php
diff --git
a/Notify.php
b/Notify.php
index
bacad59
..
15bbc7a
100644
(file)
--- a/
Notify.php
+++ b/
Notify.php
@@
-123,8
+123,11
@@
class Pman_Core_Notify extends Pman
$w = DB_DataObject::factory($this->table);
if (!$showold) {
$w = DB_DataObject::factory($this->table);
if (!$showold) {
- $w->whereAdd('act_when > sent'); // eg.. sent is not valid..
+ // standard
+
+ $w->whereAdd('act_when > sent'); // eg.. sent is not valid..
+ $w->whereAdd('act_start > NOW() - INTERVAL 14 DAY'); // ignore the ones stuck in the queue
if (!$this->force) {
$w->whereAdd('act_when < NOW()'); // eg.. not if future..
}
if (!$this->force) {
$w->whereAdd('act_when < NOW()'); // eg.. not if future..
}