|
@@ -155,7 +155,7 @@ discard block |
|
|
block discarded – undo |
|
155
|
155
|
// If template was not defined before... |
|
156
|
156
|
if ($this->template->getFile() === NULL) { |
|
157
|
157
|
// ...try to get base component template file |
|
158
|
|
- $templateFile = !empty($this->templateFile) ? $this->templateFile : __DIR__ . DIRECTORY_SEPARATOR . 'template' . DIRECTORY_SEPARATOR . 'default' . DIRECTORY_SEPARATOR . 'default.latte'; |
|
|
158
|
+ $templateFile = !empty($this->templateFile) ? $this->templateFile : __DIR__.DIRECTORY_SEPARATOR.'template'.DIRECTORY_SEPARATOR.'default'.DIRECTORY_SEPARATOR.'default.latte'; |
|
159
|
159
|
$this->template->setFile($templateFile); |
|
160
|
160
|
} |
|
161
|
161
|
} |
|
@@ -196,8 +196,8 @@ discard block |
|
|
block discarded – undo |
|
196
|
196
|
$templateName = preg_replace('/.latte/', '', $templateFile); |
|
197
|
197
|
|
|
198
|
198
|
// ...check if extension template is used |
|
199
|
|
- if (is_file($dir . DIRECTORY_SEPARATOR . 'template' . DIRECTORY_SEPARATOR . $templateName . '.latte')) { |
|
200
|
|
- $templateFile = $dir . DIRECTORY_SEPARATOR . 'template' . DIRECTORY_SEPARATOR . $templateName . '.latte'; |
|
|
199
|
+ if (is_file($dir.DIRECTORY_SEPARATOR.'template'.DIRECTORY_SEPARATOR.$templateName.'.latte')) { |
|
|
200
|
+ $templateFile = $dir.DIRECTORY_SEPARATOR.'template'.DIRECTORY_SEPARATOR.$templateName.'.latte'; |
|
201
|
201
|
|
|
202
|
202
|
} else { |
|
203
|
203
|
// ...if not throw exception |
Please login to merge, or discard this patch.