Merge remote-tracking branch 'sulu/release/1.6' into release/2.0

sulu · Jan 22, 2020 · e338c9a · e338c9a
2 parents 0bd2878 + b26a3c4
commit e338c9a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 CHANGELOG for Sulu
 ==================
 
+* dev-release/1.6
+    * BUGFIX      #4998  [ContentBundle]           Fix assigning more than 10 teasers when using elasticsearch
+
 * 1.6.30 (2020-01-13)
     * ENHANCEMENT #4968  [MediaBundle]             Improve performance for one layered images
 

diff --git a/src/Sulu/Bundle/PageBundle/Teaser/PageTeaserProvider.php b/src/Sulu/Bundle/PageBundle/Teaser/PageTeaserProvider.php
@@ -71,6 +71,7 @@ function($item) {
             ->createSearch(implode(' OR ', $statements))
             ->indexes($this->getPageIndexes())
             ->locale($locale)
+            ->setLimit(count($ids))
             ->execute();
 
         /** @var QueryHit $item */

diff --git a/src/Sulu/Bundle/PageBundle/Tests/Unit/Teaser/PageTeaserProviderTest.php b/src/Sulu/Bundle/PageBundle/Tests/Unit/Teaser/PageTeaserProviderTest.php
@@ -91,6 +91,7 @@ function($searchQuery) use ($ids) {
         )->willReturn($this->search->reveal())->shouldBeCalled();
         $this->search->indexes(['page_sulu_io_published'])->willReturn($this->search->reveal())->shouldBeCalled();
         $this->search->locale('de')->willReturn($this->search->reveal())->shouldBeCalled();
+        $this->search->setLimit(2)->willReturn($this->search->reveal())->shouldBeCalled();
         $this->search->execute()->willReturn(
             [$this->createQueryHit($ids[0], $data[$ids[0]]), $this->createQueryHit($ids[1], $data[$ids[1]])]
         );