From a054564c8b9dc2b9b4230c7315dcb643d6d52d3c Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Thu, 9 Feb 2017 12:03:01 +0100 Subject: [PATCH] prevent some undefined index errors --- controller/viewcontroller.php | 3 +++ tests/php/controller/viewcontrollerTest.php | 3 +++ 2 files changed, 6 insertions(+) diff --git a/controller/viewcontroller.php b/controller/viewcontroller.php index 9875a17ae..dd50db644 100644 --- a/controller/viewcontroller.php +++ b/controller/viewcontroller.php @@ -153,8 +153,11 @@ public function publicIndex() { 'appVersion' => $appVersion, 'initialView' => 'month', 'emailAddress' => '', + 'skipPopover' => 'no', + 'weekNumbers' => 'no', 'supportsClass' => $supportsClass, 'firstRun' => 'no', + 'webCalWorkaround' => 'no', 'isPublic' => true, 'shareURL' => $this->request->getServerProtocol() . '://' . $this->request->getServerHost() . $this->request->getRequestUri(), 'previewImage' => $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'favicon-touch.png')), diff --git a/tests/php/controller/viewcontrollerTest.php b/tests/php/controller/viewcontrollerTest.php index 258d81e91..89edf5c27 100755 --- a/tests/php/controller/viewcontrollerTest.php +++ b/tests/php/controller/viewcontrollerTest.php @@ -344,11 +344,14 @@ public function testPublicIndex($isAssetPipelineEnabled, $showAssetPipelineError 'appVersion' => '42.13.37', 'initialView' => 'month', 'emailAddress' => '', + 'skipPopover' => 'no', + 'weekNumbers' => 'no', 'supportsClass' => $expectsSupportsClass, 'isPublic' => true, 'shareURL' => '://', 'previewImage' => null, 'firstRun' => 'no', + 'webCalWorkaround' => 'no', 'needsAutosize' => $needsAutosize, ], $actual->getParams()); $this->assertEquals('main', $actual->getTemplateName());