From 296f8b3540847b25926358f9e2d25056d2b59bca Mon Sep 17 00:00:00 2001 From: Maxence Lange Date: Thu, 6 Dec 2018 13:47:12 -0100 Subject: [PATCH] small fix Signed-off-by: Maxence Lange --- lib/Cron/Queue.php | 2 +- lib/Db/FollowsRequest.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/Cron/Queue.php b/lib/Cron/Queue.php index e63f8383..44438df8 100644 --- a/lib/Cron/Queue.php +++ b/lib/Cron/Queue.php @@ -85,7 +85,7 @@ class Queue extends TimedJob { private function manageQueue() { - $requests = $this->queueService->getRequestStandby($total = 0); + $requests = $this->queueService->getRequestStandby(); $this->activityService->manageInit(); foreach ($requests as $request) { diff --git a/lib/Db/FollowsRequest.php b/lib/Db/FollowsRequest.php index 708f2513..fac47cdb 100644 --- a/lib/Db/FollowsRequest.php +++ b/lib/Db/FollowsRequest.php @@ -177,7 +177,7 @@ class FollowsRequest extends FollowsRequestBuilder { $this->limitToAccepted($qb, true); $this->leftJoinCacheActors($qb, 'actor_id'); $this->leftJoinDetails($qb, 'id', 'ca'); - $qb->orderBy('creation', 'desc'); + $qb->orderBy('f.creation', 'desc'); $follows = []; $cursor = $qb->execute(); @@ -201,7 +201,7 @@ class FollowsRequest extends FollowsRequestBuilder { $this->limitToAccepted($qb, true); $this->leftJoinCacheActors($qb, 'object_id'); $this->leftJoinDetails($qb, 'id', 'ca'); - $qb->orderBy('creation', 'desc'); + $qb->orderBy('f.creation', 'desc'); $follows = []; $cursor = $qb->execute();