Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 945acf2a authored by AVINASH GUSAIN's avatar AVINASH GUSAIN
Browse files

upgrade to 4.52

parent ccf8e4a0

lib/Controller/BookingController.php

+0 −4
Original line number Diff line number Diff line
@@ -76,11 +76,7 @@ class BookingController extends Controller { 
		IInitialState $initialState,

		BookingService $bookingService,

		AppointmentConfigService $appointmentConfigService,

<<<<<<< HEAD

		URLGenerator $urlGenerator,

=======

		IURLGenerator $urlGenerator,

>>>>>>> 956826ca66b66de76eb7561ddf0ad088428115c4

		LoggerInterface $logger,

		IMailer $mailer,

		IConfig $systemConfig) {

lib/Controller/PublicViewController.php

+0 −3
Original line number Diff line number Diff line
@@ -139,10 +139,7 @@ class PublicViewController extends Controller { 
		$this->initialStateService->provideInitialState($this->appName, 'tasks_enabled', false);

		$this->initialStateService->provideInitialState($this->appName, 'hide_event_export', false);

		$this->initialStateService->provideInitialState($this->appName, 'can_subscribe_link', $defaultCanSubscribeLink);

<<<<<<< HEAD

=======

		$this->initialStateService->provideInitialState($this->appName, 'show_resources', false);

>>>>>>> 956826ca66b66de76eb7561ddf0ad088428115c4



		return new PublicTemplateResponse($this->appName, 'main', [

			'share_url' => $this->getShareURL(),

lib/Controller/ViewController.php

+0 −6
Original line number Diff line number Diff line
@@ -140,10 +140,7 @@ class ViewController extends Controller { 
		$this->initialStateService->provideInitialState('appointmentConfigs', $this->appointmentConfigService->getAllAppointmentConfigurations($this->userId));

		$this->initialStateService->provideInitialState('disable_appointments', $disableAppointments);

		$this->initialStateService->provideInitialState('can_subscribe_link', $canSubscribeLink);

<<<<<<< HEAD

=======

		$this->initialStateService->provideInitialState('show_resources', $showResources);

>>>>>>> 956826ca66b66de76eb7561ddf0ad088428115c4



		return new TemplateResponse($this->appName, 'main');

	}
@@ -201,11 +198,8 @@ class ViewController extends Controller { 
		}

		$file = $folder->newFile($color . '.svg', $svg);

		$response = new FileDisplayResponse($file);

<<<<<<< HEAD

=======

		// Some browsers won't render SVGs without content types (for security reasons)

		$response->addHeader('Content-Type', 'image/svg+xml');

>>>>>>> 956826ca66b66de76eb7561ddf0ad088428115c4

		$response->cacheFor(24 * 3600); // 1 day

		return $response;

	}