Skip to content

Commit 78d1b1d

Browse files
committed
#115 fix php7.4 errors/notices
1 parent c4d432f commit 78d1b1d

File tree

2 files changed

+18
-14
lines changed

2 files changed

+18
-14
lines changed

Assets/css/userthemes/.gitignore

Whitespace-only changes.

Controller/CustomizerFileController.php

+18-14
Original file line numberDiff line numberDiff line change
@@ -87,20 +87,24 @@ protected function renderFileWithoutCache(array $file, $mimetype)
8787

8888
public function show()
8989
{
90-
$logo = $this->customizerFileModel->getByType(1);
91-
$flavicon = $this->customizerFileModel->getByType(2);
92-
$loginlogo = $this->customizerFileModel->getByType(3);
93-
$logopath = $logo['path'];
94-
$flaviconpath = $flavicon['path'];
95-
$this->response->html($this->helper->layout->config('customizer:file/show', array(
96-
'logo' => $logo,
97-
'title' => t('Settings').' > '.t('Customizer'),
98-
'flavicon' => $flavicon,
99-
'logopath' => $logopath,
100-
'flaviconpath' => $flaviconpath,
101-
'loginlogo' => $loginlogo
102-
)));
103-
90+
$logo = $this->customizerFileModel->getByType(1)?? ['id' => null, 'name' => null];
91+
$flavicon = $this->customizerFileModel->getByType(2) ?? ['id' => null, 'name' => null];
92+
$loginlogo = $this->customizerFileModel->getByType(3) ?? ['id' => null, 'name' => null];
93+
$logopath = $logo['path'] ?? null;
94+
$flaviconpath = $flavicon['path'] ?? null;
95+
$this->response->html(
96+
$this->helper->layout->config(
97+
'customizer:file/show',
98+
[
99+
'logo' => $logo,
100+
'title' => t('Settings') . ' > ' . t('Customizer'),
101+
'flavicon' => $flavicon,
102+
'logopath' => $logopath,
103+
'flaviconpath' => $flaviconpath,
104+
'loginlogo' => $loginlogo,
105+
]
106+
)
107+
);
104108
}
105109

106110
public function logo()

0 commit comments

Comments
 (0)