trusty-cms 1.1.21 → 1.1.22

Sign up to get free protection for your applications and to get access to all the features.
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- trusty-cms (1.1.20)
4
+ trusty-cms (1.1.21)
5
5
  RedCloth (~> 4.2.0)
6
6
  acts_as_tree (~> 0.1.1)
7
7
  bundler (>= 1.0.0)
@@ -30,7 +30,6 @@ GEM
30
30
  remote: https://rubygems.org/
31
31
  specs:
32
32
  RedCloth (4.2.9)
33
- RedCloth (4.2.9-java)
34
33
  actionmailer (3.2.21)
35
34
  actionpack (= 3.2.21)
36
35
  mail (~> 2.5.4)
@@ -21,7 +21,12 @@ class SiteController < ApplicationController
21
21
  end
22
22
  if @page = find_page(url)
23
23
  batch_page_status_refresh if (url == "/" || url == "")
24
- process_page(@page)
24
+ # This is a bit of a hack to get Vanity URL pages working in another extension
25
+ # In Rails 2, redirect_to halted execution, so process_page could be aliased and
26
+ # a redirect could be used. This no longer works. There's a better fix for this,
27
+ # but for now, anything that aliases process_page can return false if it's rendering
28
+ # or redirecting on its own.
29
+ return unless process_page(@page)
25
30
  set_cache_control
26
31
  @performed_render ||= true
27
32
  render layout: false
data/lib/trusty_cms.rb CHANGED
@@ -5,7 +5,7 @@ unless defined? TrustyCms::Version
5
5
  module Version
6
6
  Major = '1'
7
7
  Minor = '1'
8
- Tiny = '21'
8
+ Tiny = '22'
9
9
  Patch = nil # set to nil for normal release
10
10
 
11
11
  class << self
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: trusty-cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.21
4
+ version: 1.1.22
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2015-01-08 00:00:00.000000000 Z
12
+ date: 2015-01-09 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: tzinfo