Skip to content
Permalink
Browse files

Merge branch 'master' into 2859-blog-example-data-isnt-realistic

  • Loading branch information...
carakas committed Jul 29, 2019
2 parents 54c791e + daeb368 commit 80793c8a9e948fcfed3b7744b408940a3679acfd
Showing with 19 additions and 15 deletions.
  1. +13 −13 composer.lock
  2. +5 −1 src/Common/DataCollector/PageContextDataCollector.php
  3. +1 −1 src/Frontend/Core/Engine/Block/Widget.php

Some generated files are not rendered by default. Learn more.

@@ -106,8 +106,12 @@ public function reset(): void
$this->data = [];
}
private function getFullTemplatePath(string $templatePath): string
private function getFullTemplatePath(string $templatePath): ?string
{
if ($templatePath === '') {
return null;
}
$themePath = FRONTEND_PATH . '/Themes/' . $this->theme;
if (file_exists($themePath . '/Modules/' . $templatePath)) {
@@ -260,6 +260,6 @@ public static function getForId(KernelInterface $kernel, string $module, string
public function getTemplatePath(): string
{
return $this->template->getPath($this->getCustomTemplate() ?? $this->object->templatePath);
return $this->template->getPath($this->getCustomTemplate() ?? $this->object->templatePath ?? '');
}
}

0 comments on commit 80793c8

Please sign in to comment.
You can’t perform that action at this time.