added missing cast to array
authormario_matzulla <mario_matzulla@735d13b6-9817-0410-8766-e36946ffe9aa>
Tue, 1 Mar 2016 10:49:27 +0000 (10:49 +0000)
committermario_matzulla <mario_matzulla@735d13b6-9817-0410-8766-e36946ffe9aa>
Tue, 1 Mar 2016 10:49:27 +0000 (10:49 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Extensions/cal_ts_service/trunk@90665 735d13b6-9817-0410-8766-e36946ffe9aa

Classes/Model/TypoScriptEventModel.php

index 443bc52..853d130 100644 (file)
@@ -53,7 +53,7 @@ class TypoScriptEventModel extends \TYPO3\CMS\Cal\Model\EventModel {
                // And refill it again :)
                $this->conf = $tempConf;
                
-               $this->conf ['view.'] [$this->conf ['view'] . '.'] ['event.'] = array_merge ( $this->conf ['view.'] [$this->conf ['view'] . '.'] ['event.'], ( array ) $conf [$this->conf ['view'] . '.'] ['event.'] );
+               $this->conf ['view.'] [$this->conf ['view'] . '.'] ['event.'] = array_merge ( (array) $this->conf ['view.'] [$this->conf ['view'] . '.'] ['event.'], ( array ) $conf [$this->conf ['view'] . '.'] ['event.'] );
                $this->isException = $isException;
                $this->setType ( 'tx_cal_ts_service' );
                $this->createEvent ( $row, $isException );