spud_cms 0.9.3 → 0.9.4

data/app/controllers/pages_controller.rb

@@ -58,7 +58,7 @@ class PagesController < ApplicationController
 			return if defined?(require_user) && require_user == false
 		end
 
-		layout = @page.layout || Spud::Cms.default_page_layout
+		layout = Spud::Cms.default_page_layout
 
 		# MultiSite Code Block
 		if Spud::Core.multisite_mode_enabled && !site_config.blank?
@@ -66,6 +66,8 @@ class PagesController < ApplicationController
 			layout = cms_config[:default_page_layout] if !cms_config.blank? && !cms_config[:default_page_layout].blank?
 		end
 
+		layout = @page.layout || layout
+
 
 		render :layout => layout
 

data/app/views/pages/show.html.erb

@@ -14,7 +14,6 @@
 	<%=render :inline => @inline%>
 <%end%>
 <%@page.spud_page_partials.each do |page_partial|%>
-
 	<%if(page_partial.name.match(/^body$/i) && Spud::Cms.yield_body_as_content_block == false)%>
 		<%=page_partial.content_processed.html_safe%>
 	<%else%>

data/lib/spud_cms/version.rb

@@ -1,5 +1,5 @@
 module Spud
 	module Cms
-		VERSION = "0.9.3"
+		VERSION = "0.9.4"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spud_cms
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
   prerelease: 
 platform: ruby
 authors:
@@ -392,7 +392,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3350950452711626729
+      hash: 3087856532993210012
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -401,7 +401,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3350950452711626729
+      hash: 3087856532993210012
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24