browsercms 3.5.5 → 3.5.6

data/lib/cms/acts/content_page.rb

@@ -56,6 +56,10 @@ module Cms
         end
       end
 
+      def determine_page_layout
+        @page.layout
+      end
+
       module ClassMethods
 
         # Requires that some or all of the actions on this controller require the same permissions as a specific section of the website.

data/lib/cms/content_rendering_support.rb

@@ -28,6 +28,12 @@ module Cms
       handle_error_with_cms_page(Cms::ErrorPages::SERVER_ERROR_PATH, exception, :internal_server_error)
     end
 
+    # Basic implementation for looking up the template based on the page layout.
+    # This will be overwritten by Cms::MobileAware to show mobile aware templates.
+    def determine_page_layout
+      @page.layout
+    end
+
     private
 
     # This is the method all error handlers delegate to
@@ -62,7 +68,7 @@ module Cms
 
         # The error pages are ALWAYS html since they are managed by the CMS as normal pages.
         # So .gif or .jpg requests that throw errors will return html rather than a format warning.
-        render :layout => @page.layout, :template => 'cms/content/show', :status => status, :formats=>[:html]
+        render :layout => determine_page_layout, :template => 'cms/content/show', :status => status, :formats=>[:html]
       else
         handle_server_error(exception)
       end

data/lib/cms/version.rb

@@ -2,7 +2,7 @@
 # Allows the precise version of BrowserCMS to be determined programatically.
 #
 module Cms
-  VERSION = "3.5.5"
+  VERSION = "3.5.6"
 
   # Return the current version of the CMS.
   def self.version

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: browsercms
 version: !ruby/object:Gem::Version
-  version: 3.5.5
+  version: 3.5.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-12 00:00:00.000000000 Z
+date: 2013-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -776,7 +776,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1146009963062196291
+      hash: 1280094750277936312
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24