spud_cms 0.9.3 → 0.9.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. data/app/controllers/pages_controller.rb +3 -1
  2. data/app/views/pages/show.html.erb +0 -1
  3. data/lib/spud_cms/version.rb +1 -1
  4. metadata +3 -3
data/app/controllers/pages_controller.rb CHANGED
@@ -58,7 +58,7 @@ class PagesController < ApplicationController
58
58
  return if defined?(require_user) && require_user == false
59
59
  end
60
60
 
61
- layout = @page.layout || Spud::Cms.default_page_layout
61
+ layout = Spud::Cms.default_page_layout
62
62
 
63
63
  # MultiSite Code Block
64
64
  if Spud::Core.multisite_mode_enabled && !site_config.blank?
@@ -66,6 +66,8 @@ class PagesController < ApplicationController
66
66
  layout = cms_config[:default_page_layout] if !cms_config.blank? && !cms_config[:default_page_layout].blank?
67
67
  end
68
68
 
69
+ layout = @page.layout || layout
70
+
69
71
 
70
72
  render :layout => layout
71
73
 
data/app/views/pages/show.html.erb CHANGED
@@ -14,7 +14,6 @@
14
14
  <%=render :inline => @inline%>
15
15
  <%end%>
16
16
  <%@page.spud_page_partials.each do |page_partial|%>
17
-
18
17
  <%if(page_partial.name.match(/^body$/i) && Spud::Cms.yield_body_as_content_block == false)%>
19
18
  <%=page_partial.content_processed.html_safe%>
20
19
  <%else%>
data/lib/spud_cms/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Spud
2
2
  module Cms
3
- VERSION = "0.9.3"
3
+ VERSION = "0.9.4"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spud_cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.3
4
+ version: 0.9.4
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -392,7 +392,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
392
392
  version: '0'
393
393
  segments:
394
394
  - 0
395
- hash: 3350950452711626729
395
+ hash: 3087856532993210012
396
396
  required_rubygems_version: !ruby/object:Gem::Requirement
397
397
  none: false
398
398
  requirements:
@@ -401,7 +401,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
401
401
  version: '0'
402
402
  segments:
403
403
  - 0
404
- hash: 3350950452711626729
404
+ hash: 3087856532993210012
405
405
  requirements: []
406
406
  rubyforge_project:
407
407
  rubygems_version: 1.8.24