diff --git a/Controller/AccessCountersController.php b/Controller/AccessCountersController.php index 70251f0..6105782 100644 --- a/Controller/AccessCountersController.php +++ b/Controller/AccessCountersController.php @@ -119,23 +119,17 @@ public function add() { } else { //初期データセット //--AccessCounter - $this->request->data = Hash::merge( - $this->request->data, - $this->AccessCounter->createAll(array( - 'AccessCounter' => array( - 'id' => null, - ), - 'BlocksLanguage' => array( - 'language_id' => Current::read('Language.id'), - 'name' => __d('access_counters', 'New Counter %s', date('YmdHis')), - ), - )) - ); + $this->request->data += $this->AccessCounter->createAll([ + 'AccessCounter' => [ + 'id' => null, + ], + 'BlocksLanguage' => [ + 'language_id' => Current::read('Language.id'), + 'name' => __d('access_counters', 'New Counter %s', date('YmdHis')), + ], + ]); //--AccessCounterFrameSetting - $this->request->data = Hash::merge( - $this->request->data, - $this->AccessCounterFrameSetting->getAccessCounterFrameSetting(true) - ); + $this->request->data += $this->AccessCounterFrameSetting->getAccessCounterFrameSetting(true); //--Frame $this->request->data['Frame'] = Current::read('Frame'); } @@ -163,9 +157,7 @@ public function edit() { } else { //--Block - $this->request->data['Block'] = Current::read('Block'); - $this->request->data['BlocksLanguage'] = Current::read('BlocksLanguage'); - if (! $this->request->data['Block']['key']) { + if (! Current::read('Block.key')) { $this->throwBadRequest(); return false; } @@ -174,13 +166,11 @@ public function edit() { $this->throwBadRequest(); return false; } - $this->request->data = Hash::merge($this->request->data, $accessCounter); + $this->request->data += $accessCounter; //--AccessCounterFrameSetting - $this->request->data = Hash::merge( - $this->request->data, - $this->AccessCounterFrameSetting->getAccessCounterFrameSetting(true) - ); + $this->request->data += $this->AccessCounterFrameSetting->getAccessCounterFrameSetting(true); //--Frame + $this->request->data['BlocksLanguage'] = Current::read('BlocksLanguage'); $this->request->data['Frame'] = Current::read('Frame'); } } diff --git a/Model/AccessCounter.php b/Model/AccessCounter.php index 7129403..7ba3331 100644 --- a/Model/AccessCounter.php +++ b/Model/AccessCounter.php @@ -68,7 +68,7 @@ class AccessCounter extends AccessCountersAppModel { * @see Model::save() */ public function beforeValidate($options = array()) { - $this->validate = Hash::merge($this->validate, array( + $this->validate = array_merge($this->validate, array( 'block_key' => array( 'notBlank' => array( 'rule' => array('notBlank'), @@ -197,16 +197,16 @@ public function validateAccessCounter($data) { $this->BlocksLanguage->set($data); if (! $this->BlocksLanguage->validates()) { - $this->validationErrors = Hash::merge( + $this->validationErrors = array_merge( $this->validationErrors, $this->BlocksLanguage->validationErrors ); return false; } - $this->data = Hash::merge($this->data, $this->BlocksLanguage->data); + $this->data = $this->data + $this->BlocksLanguage->data; $this->AccessCounterFrameSetting->set($data); if (! $this->AccessCounterFrameSetting->validates()) { - $this->validationErrors = Hash::merge( + $this->validationErrors = array_merge( $this->validationErrors, $this->AccessCounterFrameSetting->validationErrors ); return false; diff --git a/Model/AccessCounterFrameSetting.php b/Model/AccessCounterFrameSetting.php index f40a32a..a880b88 100644 --- a/Model/AccessCounterFrameSetting.php +++ b/Model/AccessCounterFrameSetting.php @@ -92,7 +92,7 @@ class AccessCounterFrameSetting extends AccessCountersAppModel { public function beforeValidate($options = array()) { $displayTypes = array_keys(self::$displayTypes); - $this->validate = Hash::merge($this->validate, array( + $this->validate = array_merge($this->validate, array( 'frame_key' => array( 'notBlank' => array( 'rule' => array('notBlank'),