Merge branch 'redesign' of github.com:eston/gollum into redesign

2010-12-07 13:19:33 -08:00
parent 2de9f5f396 0472a95ac0
commit 5cb54e0a36
7 changed files with 6 additions and 725 deletions
@@ -18,17 +18,17 @@ module Precious
      end
      
      def format
-        @format = (@page.format || false) if @format.nil?
+        @format = (@page.format || false) if @format.nil? && @page
        @format.to_s.downcase
      end
-    
-      def has_footer 
-        @footer = (@page.footer || false) if @footer.nil?
+
+      def has_footer
+        @footer = (@page.footer || false) if @footer.nil? && @page
        !!@footer
      end
-        
+
      def has_sidebar
-        @sidebar = (@page.sidebar || false) if @sidebar.nil?
+        @sidebar = (@page.sidebar || false) if @sidebar.nil? && @page
        !!@sidebar
      end