spud_cms 0.9.3 → 0.9.4
Sign up to get free protection for your applications and to get access to all the features.
@@ -58,7 +58,7 @@ class PagesController < ApplicationController
|
|
58
58
|
return if defined?(require_user) && require_user == false
|
59
59
|
end
|
60
60
|
|
61
|
-
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/lib/spud_cms/version.rb
CHANGED
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.
|
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:
|
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:
|
404
|
+
hash: 3087856532993210012
|
405
405
|
requirements: []
|
406
406
|
rubyforge_project:
|
407
407
|
rubygems_version: 1.8.24
|