spud_cms 0.8.1 → 0.8.2

data/app/controllers/pages_controller.rb

@@ -15,7 +15,7 @@ class PagesController < ApplicationController
 		# MultiSite Code Block
 		if Spud::Core.multisite_mode_enabled
 			site_config = Spud::Core.site_config_for_host(request.host_with_port)
-			@page = @page.site(site_config[:site_id]) if !site_config.blank?
+			@page = @page.site(!site_config.blank? ? site_config[:site_id] : nil) 
 		end
 
 		@page = @page.first
@@ -23,8 +23,8 @@ class PagesController < ApplicationController
 			@permalink = SpudPermalink.includes(:attachment).where(:url_name => url_name)
 
 			# MultiSite Code Block
-			if Spud::Core.multisite_mode_enabled && !site_config.blank?
-				@permalink = @permalink.site(site_config[:site_id])
+			if Spud::Core.multisite_mode_enabled
+				@permalink = @permalink.site(!site_config.blank? ? site_config[:site_id] : nil)
 			end
 			@permalink = @permalink.first
 

data/app/controllers/spud/admin/pages_controller.rb

@@ -172,6 +172,7 @@ class Spud::Admin::PagesController < Spud::Admin::CmsController
 			end 
 		end
 	end
+	redirect_to spud_admin_pages_url
   end
 
 private

data/lib/spud_cms/version.rb

@@ -1,5 +1,5 @@
 module Spud
 	module Cms
-		VERSION = "0.8.1"
+		VERSION = "0.8.2"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spud_cms
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-01 00:00:00.000000000 Z
+date: 2012-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70155890998780 !ruby/object:Gem::Requirement
+  requirement: &70301795307200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70155890998780
+  version_requirements: *70301795307200
 - !ruby/object:Gem::Dependency
   name: spud_core
-  requirement: &70155890997960 !ruby/object:Gem::Requirement
+  requirement: &70301795304360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *70155890997960
+  version_requirements: *70301795304360
 - !ruby/object:Gem::Dependency
   name: spud_permalinks
-  requirement: &70155890997240 !ruby/object:Gem::Requirement
+  requirement: &70301795302800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -46,10 +46,10 @@ dependencies:
         version: 0.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *70155890997240
+  version_requirements: *70301795302800
 - !ruby/object:Gem::Dependency
   name: codemirror-rails
-  requirement: &70155890996860 !ruby/object:Gem::Requirement
+  requirement: &70301795301820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +57,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70155890996860
+  version_requirements: *70301795301820
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &70155890996360 !ruby/object:Gem::Requirement
+  requirement: &70301795312320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,10 +68,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70155890996360
+  version_requirements: *70301795312320
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70155890995940 !ruby/object:Gem::Requirement
+  requirement: &70301795308200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,10 +79,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70155890995940
+  version_requirements: *70301795308200
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70155890995520 !ruby/object:Gem::Requirement
+  requirement: &70301795350780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -90,10 +90,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70155890995520
+  version_requirements: *70301795350780
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70155890995020 !ruby/object:Gem::Requirement
+  requirement: &70301795349580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -101,10 +101,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *70155890995020
+  version_requirements: *70301795349580
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70155890994480 !ruby/object:Gem::Requirement
+  requirement: &70301795346240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -112,10 +112,10 @@ dependencies:
         version: 0.10.3
   type: :development
   prerelease: false
-  version_requirements: *70155890994480
+  version_requirements: *70301795346240
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &70155890994000 !ruby/object:Gem::Requirement
+  requirement: &70301795344340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -123,7 +123,7 @@ dependencies:
         version: 0.7.1
   type: :development
   prerelease: false
-  version_requirements: *70155890994000
+  version_requirements: *70301795344340
 description: Spud CMS is a full-featured light weight modular cms engine as a part
   of the spud suite of rails gems. This particular gem comes with page management,
   administrative dashboard, template management, menu management and more. It is also
@@ -258,7 +258,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -403661204937112407
+      hash: 575884119774919315
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -267,7 +267,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -403661204937112407
+      hash: 575884119774919315
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15