muck-users 3.1.1 → 3.1.2

data/VERSION

@@ -1 +1 @@
-3.1.1
+3.1.2

data/app/controllers/muck/users_controller.rb

@@ -285,7 +285,13 @@ class Muck::UsersController < ApplicationController
       if success
         respond_to do |format|
           format.html do
-            redirect_to success_redirect || (admin? ? public_user_path(@user) : user_path(@user))
+            if(success_redirect)
+              redirect_to success_redirect
+            elsif current_user == @user
+              redirect_to user_path(@user)
+            else # admin
+              redirect_to public_user_path(@user)
+            end  
           end
           format.xml{ head :ok }
         end

data/config/locales/en.yml

@@ -198,7 +198,7 @@ en:
       bulk_access_code_message: Message
       bulk_access_codes: Bulk Access Codes
       add_access_code: Add Access Code
-      user_update: You're user information has been updated.
+      user_update: Your user information has been updated.
       update_profile: Update your profile
       update_user: Update your user information
       update_user_admin: Update User

data/lib/muck-users/models/user.rb

@@ -38,7 +38,7 @@ module MuckUsers
         # prevents a user from submitting a crafted form that bypasses activation
         attr_protected :crypted_password, :password_salt, :persistence_token, :single_access_token, :perishable_token, :login_count,
                        :failed_login_count, :last_request_at, :last_login_at, :current_login_at, :current_login_ip, :last_login_ip, 
-                       :terms_of_service, :time_zone, :disabled_at, :activated_at, :created_at, :updated_at
+                       :terms_of_service, :disabled_at, :activated_at, :created_at, :updated_at
       
         validates_terms_of_service if MuckUsers.configuration.validate_terms_of_service
       end

data/muck-users.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-users}
-  s.version = "3.1.1"
+  s.version = "3.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball", "Joel Duffin"]
-  s.date = %q{2010-11-18}
+  s.date = %q{2010-11-27}
   s.description = %q{Easily add user signup, login and other features to your application}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: muck-users
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: false
   segments: 
   - 3
   - 1
-  - 1
-  version: 3.1.1
+  - 2
+  version: 3.1.2
 platform: ruby
 authors: 
 - Justin Ball
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-18 00:00:00 -07:00
+date: 2010-11-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency