proper site loading for render method

Oleg committed Sep 08, 2011

commit fa629dde006b9d8ae8ee85536619d3d0394ed246

Showing 2 changed files with 3 additions and 3 deletions

app/views/cms_admin/pages/_form.html.erb +2 -2

@@	@@ -27,10 +27,10 @@
	<%= cms_hook :page_form, :object => form %>
	</div>

-	<%= render :partial => 'form_blocks' %>
-
	<%= render :partial => 'cms_admin/categories/form', :object => form %>

+	<%= render :partial => 'form_blocks' %>
+
	<%= form.simple_field nil, nil, :class => 'submit_element' do %>
	<%= form.check_box :is_published, :disable_builder => true %>
	<%= form.label_for :is_published %>

comfortable_mexican_sofa/controller_methods.rb b/lib/comfortable_mexican_sofa/controller_methods.rb +1 -1

@@	@@ -20,7 +20,7 @@ module ComfortableMexicanSofa::ControllerMethods
	# by the cms page and/or layout)
	def render(options = {}, locals = {}, &block)
	if options.is_a?(Hash) && path = options.delete(:cms_page)
-	site = Cms::Site.find_by_hostname(request.host.downcase)
+	site = Cms::Site.find_site(request.host.downcase, request.fullpath)
	page = site && site.pages.find_by_full_path(path)
	if page
	cms_app_layout = page.layout.try(:app_layout)