From c78a9f79500a939a6d457e38f6accea9f4f63962 Mon Sep 17 00:00:00 2001
From: Dawa Ometto <dawa.ometto@phil.uu.nl>
Date: Mon, 10 Nov 2014 22:39:42 +0100
Subject: [PATCH] Fix sidebar, header, and footer, and add regression test.

---
 lib/gollum/views/page.rb | 6 +++---
 test/test_app.rb         | 7 +++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/lib/gollum/views/page.rb b/lib/gollum/views/page.rb
index c30210e3..23ff6c54 100644
--- a/lib/gollum/views/page.rb
+++ b/lib/gollum/views/page.rb
@@ -57,7 +57,7 @@ module Precious
 
       def has_header
         if @header
-          return false if @header.formatted_data.strip.empty?
+          @header.formatted_data.strip.empty? ? false : true
         else
           @header = (@page.header || false)
           !!@header
@@ -74,7 +74,7 @@ module Precious
 
       def has_footer
         if @footer
-          return false if @footer.formatted_data.strip.empty?
+          @footer.formatted_data.strip.empty? ? false : true
         else
           @footer = (@page.footer || false)
           !!@footer
@@ -95,7 +95,7 @@ module Precious
 
       def has_sidebar
         if @sidebar
-          return false if @sidebar.formatted_data.strip.empty?
+          @sidebar.formatted_data.strip.empty? ? false : true
         else
           @sidebar = (@page.sidebar || false)
           !!@sidebar
diff --git a/test/test_app.rb b/test/test_app.rb
index ffd0e7b3..c93e3d5c 100644
--- a/test/test_app.rb
+++ b/test/test_app.rb
@@ -84,6 +84,13 @@ context "Frontend" do
     assert_match /#{expected}/, actual
   end
 
+  test "show sidebar, header, footer when present" do
+    divs = [@wiki.page("_Header").formatted_data, @wiki.page("_Footer").formatted_data, @wiki.page("_Sidebar").formatted_data]
+    @wiki.write_page("HeaderTest", :markdown, "Test", commit_details)
+    get "/HeaderTest"
+    divs.each {|div| assert_match div, last_response.body}
+  end
+
   test "retain edit information" do
     page1 = 'page1'
     user1 = 'user1'