trusty-cms 1.1.21 → 1.1.22

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (1.1.20)
+    trusty-cms (1.1.21)
       RedCloth (~> 4.2.0)
       acts_as_tree (~> 0.1.1)
       bundler (>= 1.0.0)
@@ -30,7 +30,6 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    RedCloth (4.2.9-java)
     actionmailer (3.2.21)
       actionpack (= 3.2.21)
       mail (~> 2.5.4)

data/app/controllers/site_controller.rb

@@ -21,7 +21,12 @@ class SiteController < ApplicationController
     end
     if @page = find_page(url)
       batch_page_status_refresh if (url == "/" || url == "")
-      process_page(@page)
+      # This is a bit of a hack to get Vanity URL pages working in another extension
+      # In Rails 2, redirect_to halted execution, so process_page could be aliased and
+      # a redirect could be used. This no longer works. There's a better fix for this,
+      # but for now, anything that aliases process_page can return false if it's rendering
+      # or redirecting on its own.
+      return unless process_page(@page)
       set_cache_control
       @performed_render ||= true
       render layout: false

data/lib/trusty_cms.rb

@@ -5,7 +5,7 @@ unless defined? TrustyCms::Version
     module Version
       Major = '1'
       Minor = '1'
-      Tiny  = '21'
+      Tiny  = '22'
       Patch = nil # set to nil for normal release
 
       class << self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 1.1.21
+  version: 1.1.22
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-08 00:00:00.000000000 Z
+date: 2015-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo