|
@@ -131,7 +131,7 @@ discard block |
|
|
block discarded – undo |
|
131
|
131
|
'toggle' => $this->toggleBox, |
|
132
|
132
|
'onetime' => $this->onetimeAutoUpdate, |
|
133
|
133
|
'fields' => (array_reduce($this->fields, function (array $result, Forms\Controls\BaseControl $row) { |
|
134
|
|
- $result[] = '#' . $row->getHtmlId(); |
|
|
134
|
+ $result[] = '#'.$row->getHtmlId(); |
|
135
|
135
|
|
|
136
|
136
|
return $result; |
|
137
|
137
|
}, [])), |
|
@@ -168,8 +168,8 @@ discard block |
|
|
block discarded – undo |
|
168
|
168
|
// Check if template file exists... |
|
169
|
169
|
if (!is_file($templateFile)) { |
|
170
|
170
|
// ...check if extension template is used |
|
171
|
|
- if (is_file(__DIR__ . DIRECTORY_SEPARATOR . 'template' . DIRECTORY_SEPARATOR . $templateFile)) { |
|
172
|
|
- $templateFile = __DIR__ . DIRECTORY_SEPARATOR . 'template' . DIRECTORY_SEPARATOR . $templateFile; |
|
|
171
|
+ if (is_file(__DIR__.DIRECTORY_SEPARATOR.'template'.DIRECTORY_SEPARATOR.$templateFile)) { |
|
|
172
|
+ $templateFile = __DIR__.DIRECTORY_SEPARATOR.'template'.DIRECTORY_SEPARATOR.$templateFile; |
|
173
|
173
|
|
|
174
|
174
|
} else { |
|
175
|
175
|
// ...if not throw exception |
|
@@ -185,7 +185,7 @@ discard block |
|
|
block discarded – undo |
|
185
|
185
|
*/ |
|
186
|
186
|
private function getTemplateFile() : string |
|
187
|
187
|
{ |
|
188
|
|
- return $this->templateFile !== NULL ? $this->templateFile : __DIR__ . DIRECTORY_SEPARATOR . 'template' . DIRECTORY_SEPARATOR . 'default.latte'; |
|
|
188
|
+ return $this->templateFile !== NULL ? $this->templateFile : __DIR__.DIRECTORY_SEPARATOR.'template'.DIRECTORY_SEPARATOR.'default.latte'; |
|
189
|
189
|
} |
|
190
|
190
|
|
|
191
|
191
|
/** |
Please login to merge, or discard this patch.