app/controllers/alchemy/base_controller.rb in alchemy_cms-2.2.rc8 vs app/controllers/alchemy/base_controller.rb in alchemy_cms-2.2.rc11

@@ -127,10 +127,11 @@
 
     def render_404(exception = nil)
       if exception
         logger.info "Rendering 404: #{exception.message}"
       end
-      render :file => "#{Rails.root}/public/404", :status => 404
+      @page = Page.language_root_for(session[:language_id])
+      render :file => "#{Rails.root}/public/404", :status => 404, :layout => !@page.nil?
     end
 
     protected
 
     def permission_denied