|
@@ -182,7 +182,7 @@ discard block |
|
|
block discarded – undo |
|
182
|
182
|
'onetime' => $this->onetimeAutoUpdate, |
|
183
|
183
|
'forceEdit' => $this->forceEditUpdate, |
|
184
|
184
|
'fields' => (array_reduce($this->fields, function (array $result, Forms\Controls\BaseControl $row) { |
|
185
|
|
- $result[] = '#' . $row->getHtmlId(); |
|
|
185
|
+ $result[] = '#'.$row->getHtmlId(); |
|
186
|
186
|
|
|
187
|
187
|
return $result; |
|
188
|
188
|
}, [])), |
|
@@ -206,8 +206,8 @@ discard block |
|
|
block discarded – undo |
|
206
|
206
|
// Check if template file exists... |
|
207
|
207
|
if (!is_file($templateFile)) { |
|
208
|
208
|
// ...check if extension template is used |
|
209
|
|
- if (is_file(__DIR__ . DIRECTORY_SEPARATOR . 'template' . DIRECTORY_SEPARATOR . $templateFile)) { |
|
210
|
|
- $templateFile = __DIR__ . DIRECTORY_SEPARATOR . 'template' . DIRECTORY_SEPARATOR . $templateFile; |
|
|
209
|
+ if (is_file(__DIR__.DIRECTORY_SEPARATOR.'template'.DIRECTORY_SEPARATOR.$templateFile)) { |
|
|
210
|
+ $templateFile = __DIR__.DIRECTORY_SEPARATOR.'template'.DIRECTORY_SEPARATOR.$templateFile; |
|
211
|
211
|
|
|
212
|
212
|
} else { |
|
213
|
213
|
// ...if not throw exception |
|
@@ -223,7 +223,7 @@ discard block |
|
|
block discarded – undo |
|
223
|
223
|
*/ |
|
224
|
224
|
private function getTemplateFile() : string |
|
225
|
225
|
{ |
|
226
|
|
- return $this->templateFile !== NULL ? $this->templateFile : __DIR__ . DIRECTORY_SEPARATOR . 'template' . DIRECTORY_SEPARATOR . 'default.latte'; |
|
|
226
|
+ return $this->templateFile !== NULL ? $this->templateFile : __DIR__.DIRECTORY_SEPARATOR.'template'.DIRECTORY_SEPARATOR.'default.latte'; |
|
227
|
227
|
} |
|
228
|
228
|
|
|
229
|
229
|
/** |
Please login to merge, or discard this patch.