2 files changed, 6 insertions, 1 deletions

diff --git a/app/controllers/content_controller.rb b/app/controllers/content_controller.rb
index 706cfcd..d548a34 100644
--- a/app/controllers/content_controller.rb
+++ b/app/controllers/content_controller.rb
@@ -10,7 +10,7 @@ class ContentController < ApplicationController
     
     @page = Node.find_page(path)
     
-    if @page
+    if @page and @page.public?
      template = @page.valid_template
 
       render(
@@ -25,4 +25,5 @@ class ContentController < ApplicationController
     end
     
   end
+
 end
diff --git a/app/models/page.rb b/app/models/page.rb
index ae2f998..af820e3 100644
--- a/app/models/page.rb
+++ b/app/models/page.rb
@@ -109,6 +109,10 @@ class Page < ActiveRecord::Base
     I18n.locale = locale_before
   end
   
+  def public?
+    published_at.nil? ? true : published_at < Time.now 
+  end
+  
   private
     
     def rewrite_links_in_body