ログイン/ログアウトリダイレクトの修正

diff --git a/app/controllers/components/auth_plus.php b/app/controllers/components/auth_plus.php
index ca18152..31e2ca2 100644 (file)
--- a/app/controllers/components/auth_plus.php
+++ b/app/controllers/components/auth_plus.php
@@ -35,7 +35,11 @@ class AuthPlusComponent extends AuthComponent {
                parent::initialize($controller);
 
                // ログイン後リダイレクト設定
-               $this->loginRedirect = $controller->params["url"]["url"];
+               if (isset($controller->params["url"]["url"])) {
+                       $this->loginRedirect = $controller->params["url"]["url"];
+               } else {
+                       $this->loginRedirect = Configure::read('Routing.basePath');
+               }
                if ("/".$this->loginRedirect == Router::normalize(Configure::read('Routing.loginPath'))) {
                        $this->loginRedirect = Router::normalize(Configure::read('Routing.basePath'));
                        if (Configure::read('mobileUserAgent')) {

diff --git a/app/controllers/users_controller.php b/app/controllers/users_controller.php
index 943a3e2..4b59606 100644 (file)
--- a/app/controllers/users_controller.php
+++ b/app/controllers/users_controller.php
@@ -48,7 +48,7 @@ class UsersController extends ModuleController {
                // 現在のセッション削除
                $this->AuthPlus->logout();
 
-               $this->set('refresh', array('time' => $refresh, 'url' => Router::url(array('controller' => 'characters', 'action' => 'index'), false)));
+               $this->set('refresh', array('time' => $refresh, 'url' => Router::url(Configure::read('Routing.basePath'), false)));
        }
 
        function index() {