Merge branch 'master' into release

BookStackApp · May 7, 2017 · dc0bf8a · dc0bf8a
2 parents 102e326 + 75981c2
commit dc0bf8a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/Services/PermissionService.php b/app/Services/PermissionService.php
@@ -399,7 +399,7 @@ protected function createJointPermissionData(Entity $entity, Role $role, $action
         $hasPermissiveAccessToParents = !$book->restricted;
 
         // For pages with a chapter, Check if explicit permissions are set on the Chapter
-        if ($entity->isA('page') && $entity->chapter_id !== 0) {
+        if ($entity->isA('page') && $entity->chapter_id !== 0 && $entity->chapter_id !== '0') {
             $chapter = $this->getChapter($entity->chapter_id);
             $hasPermissiveAccessToParents = $hasPermissiveAccessToParents && !$chapter->restricted;
             if ($chapter->restricted) {