MyHome設定遷移の修正

diff --git a/app/controllers/users_controller.php b/app/controllers/users_controller.php
index ab9e690..108fd1d 100644 (file)
--- a/app/controllers/users_controller.php
+++ b/app/controllers/users_controller.php
@@ -83,11 +83,10 @@ class UsersController extends AppController {
        }
 
        function index() {
-               $mycharacters = array();
+               $characters = array();
                if (empty($this->site_configs['Site.myHome']['value']) && $this->params['url']['url'] == '/') {
-//                     $this->redirect(array('controller' => 'characters', 'action'=>'mycharacter'));
-                       $mycharacters = $this->requestAction(
-                               array('controller' => 'characters', 'action' => 'mycharacter'),
+                       $characters = $this->requestAction(
+                               array('controller' => 'characters', 'action' => 'index'),
                                array('return')
                        );
                } else {
@@ -102,12 +101,12 @@ class UsersController extends AppController {
 
                        // 全体の情報
                        self::_view($this->user_id);
+               }
 
-                       // お知らせ
-                       $this->set('news', $this->get_news());
-                       }
+               $this->set('characters', $characters);
 
-               $this->set('mycharacters', $mycharacters);
+               // お知らせ
+               $this->set('news', $this->get_news());
        }
 
        function view($id = null) {

diff --git a/app/views/users/index.ctp b/app/views/users/index.ctp
index 498bd60..ff55906 100644 (file)
--- a/app/views/users/index.ctp
+++ b/app/views/users/index.ctp
@@ -1,5 +1,15 @@
-<?php if (!empty($mycharacters)): ?>
-<?php echo $mycharacters ?>
+<?php if (!empty($characters)): ?>
+
+<?php
+if (isset($news)) {
+       echo $this->element('information', array(
+               'news' => $news,
+               'cache' => time() + Configure::read('Cache.expireLong'),
+       ));
+}
+?>
+
+<?php echo $characters ?>
 <?php else: ?>
 <div id="home" class="layout2colums users view">
 <?php