From 963e33005bc6edc5c40a511fe311984a49efe85e Mon Sep 17 00:00:00 2001
From: kikito <kikito@gmail.com>
Date: Tue, 22 Dec 2015 15:38:16 +0100
Subject: [PATCH] allows nil values in per_page_js setting

---
 app/views/layouts/application.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index b517ec6fe..b7f23c60e 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -17,7 +17,7 @@
     <%= content_for :social_media_meta_tags %>
 
     <%= javascript_tag do %>
-      <%= Setting.value_for(:per_page_javascript).html_safe %>
+      <%= Setting.value_for(:per_page_javascript).try(:html_safe) %>
     <% end %>
 
   </head>