aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-01-20 21:09:16 -0800
committerfriendica <info@friendica.com>2015-01-20 21:09:16 -0800
commit19dfbfc063c0bc9d9ca76886692c32199b913b39 (patch)
tree5540da7b0cc25da931274875940e539a76d6be50
parent2d682cf8b098899148017429bb7826f98accbe97 (diff)
parentc78c1ab4b0fe5194caa4b2879780a905d7053509 (diff)
downloadvolse-hubzilla-19dfbfc063c0bc9d9ca76886692c32199b913b39.tar.gz
volse-hubzilla-19dfbfc063c0bc9d9ca76886692c32199b913b39.tar.bz2
volse-hubzilla-19dfbfc063c0bc9d9ca76886692c32199b913b39.zip
Merge https://github.com/friendica/red into pending_merge
-rw-r--r--include/poller.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/poller.php b/include/poller.php
index 896553a43..61b0881f4 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -389,7 +389,7 @@ function poller_run($argv, $argc){
}
if($dirmode == DIRECTORY_MODE_SECONDARY || $dirmode == DIRECTORY_MODE_PRIMARY) {
- $r = q("select distinct ud_addr, updates.* from updates where ( ud_flags & %d ) = 0 and ud_addr != '' and ( ud_last = '%s' OR ud_last > %s - INTERVAL %s ) group by ud_addr ",
+ $r = q("SELECT u.ud_addr, u.ud_id, u.ud_last FROM updates AS u INNER JOIN (SELECT ud_addr, max(ud_last) AS ud_last FROM updates WHERE ( ud_flags & %d ) = 0 AND ud_addr != '' AND ( ud_last = '%s' OR ud_last > %s - INTERVAL %s ) GROUP BY ud_addr) AS s ON s.ud_addr = u.ud_addr AND s.ud_last = u.ud_last ",
intval(UPDATE_FLAGS_UPDATED),
dbesc(NULL_DATE),
db_utcnow(), db_quoteinterval('7 DAY')