commit 787484d2f72485b2fba9cce492afef7006eaea77
Author: hasse <hasegawa@i-hearts.jp>
Date:   Fri Mar 11 02:42:57 2016 -0500

    app/webroot/css/main.cssの競合箇所調整

diff --git a/app/Controller/UsersController.php b/app/Controller/UsersController.php
index 1ef6740..7d9ebac 100755
--- a/app/Controller/UsersController.php
+++ b/app/Controller/UsersController.php
@@ -139,7 +139,7 @@ class UsersController extends AppController {
 	    }else{
 	    // 本登録に無効なURL
 	        $this->Session->setFlash( 'Invalid activation URL');
-			return $this->redirect(array('controller' => 'top', 'action' => 'index'));
+			return $this->redirect(array('controller' => 'top', 'action' => 'error'));
 	    }
 	}
 	
@@ -219,9 +219,6 @@ class UsersController extends AppController {
 		}
 		if ($this->request->is('post')) {
 			if ($this->Auth->login()) {
-		 //    $options = array('conditions' => array('User.email' => $this->Auth->user('User.email'),'User.status' => 1));
-			// $this->request->data = $this->User->find('first', $options);
-			// $this->set('user', $this->request->data);
 				if($this->Auth->user('status') == 1){
 					$this->redirect('/Users/login_top');                          
 				}else{