From 1023cac35016bb1a89864d10ac89acabe86cf227 Mon Sep 17 00:00:00 2001 From: jessib Date: Tue, 19 Feb 2013 11:14:39 -0800 Subject: Only check if last email alias is valid if the user has a last email alias. --- users/app/controllers/users_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'users/app/controllers/users_controller.rb') diff --git a/users/app/controllers/users_controller.rb b/users/app/controllers/users_controller.rb index ad51354..9325bc0 100644 --- a/users/app/controllers/users_controller.rb +++ b/users/app/controllers/users_controller.rb @@ -34,7 +34,7 @@ class UsersController < ApplicationController @user.attributes = params[:user] if @user.changed? and @user.save flash[:notice] = t(:user_updated_successfully) - elsif !@user.email_aliases.last.valid? + elsif @user.email_aliases.last and !@user.email_aliases.last.valid? @email_alias = @user.email_aliases.pop end respond_with @user, :location => edit_user_path(@user, :anchor => @anchor) -- cgit v1.2.3