Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Allow 404 page to have custom view/layout templates. #1746

Merged
merged 1 commit into from

3 participants

@ugisozols
Owner

This should fix #1745.

@travisbot

This pull request passes (merged 7a257f3 into 57e47eb).

@parndt parndt merged commit e14cb83 into master
@ugisozols ugisozols referenced this pull request from a commit
@ugisozols ugisozols Add note to changelog about #1746.
Conflicts:

	changelog.md
3cdbd9d
@ugisozols ugisozols referenced this pull request from a commit
@ugisozols ugisozols Add note to changelog about #1746. 3386fcd
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jun 12, 2012
  1. @ugisozols
This page is out of date. Refresh to see the latest.
Showing with 1 addition and 1 deletion.
  1. +1 −1  pages/lib/refinery/pages/instance_methods.rb
View
2  pages/lib/refinery/pages/instance_methods.rb
@@ -10,7 +10,7 @@ def self.included(base)
def error_404(exception=nil)
if (@page = ::Refinery::Page.where(:menu_match => "^/404$").includes(:parts).first).present?
# render the application's custom 404 page with layout and meta.
- render :template => '/refinery/pages/show', :formats => [:html], :status => 404
+ render_with_templates?(:status => 404)
return false
else
super
Something went wrong with that request. Please try again.