X-Git-Url: https://git.rapsys.eu/blogbundle/blobdiff_plain/ed28648958cc334b451590c91a74dd6c0784c1fe..86f4f59f5e02415a4945ae879e14d4034308dbb2:/Repository/ArticleRepository.php

diff --git a/Repository/ArticleRepository.php b/Repository/ArticleRepository.php
index 0d5a069..a2e1a5e 100644
--- a/Repository/ArticleRepository.php
+++ b/Repository/ArticleRepository.php
@@ -79,7 +79,7 @@ LEFT JOIN RapsysBlogBundle:ArticleKeyword AS ak ON (ak.article_id = a.id)
 LEFT JOIN RapsysBlogBundle:Keyword AS k ON (k.id = ak.keyword_id)
 LEFT JOIN RapsysBlogBundle:KeywordTranslation AS kt ON (kt.keyword_id = k.id AND kt.locale = :locale)
 GROUP BY a.id
-ORDER BY updated, created DESC
+ORDER BY updated, created DESC, a.id
 LIMIT :offset, :count
 SQL;
 
@@ -166,9 +166,9 @@ SQL;
 		$req = <<<SQL
 SELECT
 	b.id,
-	b.created,
-	b.updated,
-	b.modified,
+	GREATEST(b.created, kat.created) AS created,
+	GREATEST(b.updated, kat.updated) AS updated,
+	GREATEST(b.created, b.updated, kat.created, kat.updated) AS modified,
 	b.body,
 	b.description,
 	b.slug,
@@ -184,7 +184,6 @@ FROM (
 		a.id,
 		GREATEST(a.created, at.created, k.created, kt.created) AS created,
 		GREATEST(a.updated, at.updated, k.updated, kt.updated) AS updated,
-		GREATEST(a.created, at.created, k.created, kt.created, a.updated, at.updated, k.updated, kt.updated) AS modified,
 		at.body,
 		at.description,
 		at.slug,