commit 93b019618545649b54271001a793e861b1bc7f36
Author: hasse <hasegawa@i-hearts.jp>
Date:   Tue Mar 8 02:47:08 2016 -0500

    changes to 'app/Controller/UsersController.php'

diff --git a/app/Controller/UsersController.php b/app/Controller/UsersController.php
index df60ecc..604fc6c 100755
--- a/app/Controller/UsersController.php
+++ b/app/Controller/UsersController.php
@@ -119,8 +119,8 @@ class UsersController extends AppController {
 	    $this->User->id = $user_id;
 	    if ($this->User->exists() && $in_hash == $this->User->getActivationHash()) {
 	    // 本登録に有効なURL
-	        // statusフィールドを0に更新
-	        $this->User->saveField( 'status', 0);
+	        // statusフィールドを1に更新
+	        $this->User->saveField( 'status', 1);
 	        $this->Session->setFlash( 'Your account has been activated.');
 	    }else{
 	    // 本登録に無効なURL
@@ -206,8 +206,9 @@ class UsersController extends AppController {
 			if ($this->Auth->login()) {
 				$this->redirect('/Users/login_top');                          
 			} else {
-				$this->Flash->error(__('error'));
-				// $this->Flash->error(__('<section class="caution"><p>ニックネームか　パスワードに<br>まちがいが あるよ！</p></section>'));
+				$this->Flash->loginerror('ニックネームか　パスワードにまちがいが あるよ！', array(
+				    'key' => 'positive',
+					));
 			}
 		}
 	}