Merge pull request SpinaCMS#152 from arlyxiao/master

Catch error when page is nil
zachariel · May 31, 2016 · f94008f · f94008f
2 parents 842bf47 + ed59493
commit f94008f
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/app/controllers/spina/pages_controller.rb b/app/controllers/spina/pages_controller.rb
@@ -48,7 +48,9 @@ def spina_request_path
       end
 
       def current_user_can_view_page?
-        raise ActiveRecord::RecordNotFound unless page.live? || current_user.present?
+        raise ActiveRecord::RecordNotFound if page.nil? || !page.live?
+
+        current_user.present?
       end
 
       def should_skip_to_first_child?