From 387d4820590cb4a97e93cfdaaed302663baa0b7f Mon Sep 17 00:00:00 2001
From: linhk <304431313@.com>
Date: Thu, 7 Aug 2014 15:58:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=94=A8=E6=88=B7=E6=B3=A8?=
 =?UTF-8?q?=E5=86=8C=E6=97=A0=E5=9C=B0=E5=8C=BA=E3=80=81=E8=BA=AB=E4=BB=BD?=
 =?UTF-8?q?=E5=8F=AF=E6=B3=A8=E5=86=8C=E6=88=90=E5=8A=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/account_controller.rb | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index c05d1172c..c1b38fa39 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -140,6 +140,15 @@ class AccountController < ApplicationController
           @user.password, @user.password_confirmation = user_params[:password], user_params[:password_confirmation]
         end
 
+        if(@cache_identityy == "")
+          flash.now[:error]= l(:label_identity)+l(:'activerecord.errors.messages.empty')
+          return
+        end
+        if(@cache_city == "")
+          flash.now[:error]= l(:label_location)+l(:'activerecord.errors.messages.empty')
+          return
+        end
+
         case Setting.self_registration
         when '1'
           register_by_email_activation(@user)