diff options
| author | elijah <elijah@riseup.net> | 2013-02-12 21:33:39 -0800 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2013-02-12 21:33:39 -0800 |
| commit | 71ec0edea3f87fb69222dbb6fe025c2211402ca2 (patch) | |
| tree | 5490323e8686df14165ccf5f37fa2d691fc99b88 /app/controllers/pages_controller.rb | |
| parent | 00c785b728c5d97335b87e3eb7d10b9ad0c46d35 (diff) | |
added capacity for pulling static pages from multiple directory source trees.
Diffstat (limited to 'app/controllers/pages_controller.rb')
| -rw-r--r-- | app/controllers/pages_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb index d4fa09a..36c733b 100644 --- a/app/controllers/pages_controller.rb +++ b/app/controllers/pages_controller.rb @@ -7,7 +7,7 @@ class PagesController < ApplicationController rescue_from PageNotFound, :with => :render_404 def show - @page = StaticPage.find(params[:page]) + @page = site.find_pages(params[:page]) if @page respond_to do |format| format.atom { render_atom_feed(@page) } @@ -21,7 +21,7 @@ class PagesController < ApplicationController protected def choose_layout - if @page && @page.props.layout + if @page && @page.props && @page.props.layout @page.props.layout else 'application' |