replace GPL diff lib with MIT lib

[bookstack] / app / Repos / BookRepo.php

diff --git a/app/Repos/BookRepo.php b/app/Repos/BookRepo.php
index b0530b4f5ebe99e9fd017704293b7898f2c8a6e1..a11ed2763c9ce51ad7efc23d1678e1f06eeb9af1 100644 (file)
--- a/app/Repos/BookRepo.php
+++ b/app/Repos/BookRepo.php
@@ -251,7 +251,10 @@ class BookRepo extends EntityRepo
         }]);
         $chapterQuery = $this->permissionService->enforceChapterRestrictions($chapterQuery, 'view');
         $chapters = $chapterQuery->get();
-        $children = $pages->merge($chapters);
+        $children = $pages->values();
+        foreach ($chapters as $chapter) {
+            $children->push($chapter);
+        }
         $bookSlug = $book->slug;
 
         $children->each(function ($child) use ($bookSlug) {