mirror of
https://github.com/silverstripe/silverstripe-cms
synced 2024-10-22 08:05:56 +02:00
599e198e89
Hello @robbieaverill, please check my assumption...it's been a long time since I have last used SS (v3.2 was my last, if i remember correctly)
in the following lines 438:
```php
if (isset($this->templates[$action]) && $this->templates[$action]
|| (isset($this->templates['index']) && $this->templates['index'])
|| $this->template
) {
return parent::getViewer($action);
}
```
it looks like the 1st two (same-line) condition should be wrapped inside `()` while checking for a non-index action template .... if not just kill this PR at once. :-)
if the answer is yes then we can just use `!empty(...)` which is the same as 'isset(...) + truthy check'
kind regards,
maks
|
||
|---|---|---|
| .. | ||
| CMSMain.php | ||
| CMSPageAddController.php | ||
| CMSPageEditController.php | ||
| CMSPageHistoryController.php | ||
| CMSPagesController.php | ||
| CMSPageSettingsController.php | ||
| CMSSiteTreeFilter_ChangedPages.php | ||
| CMSSiteTreeFilter_DeletedPages.php | ||
| CMSSiteTreeFilter_PublishedPages.php | ||
| CMSSiteTreeFilter_Search.php | ||
| CMSSiteTreeFilter_StatusDeletedPages.php | ||
| CMSSiteTreeFilter_StatusDraftPages.php | ||
| CMSSiteTreeFilter_StatusRemovedFromDraftPages.php | ||
| CMSSiteTreeFilter.php | ||
| ContentController.php | ||
| LeftAndMainPageIconsExtension.php | ||
| ModelAsController.php | ||
| OldPageRedirector.php | ||
| RootURLController.php | ||
| SilverStripeNavigator.php | ||
| SilverStripeNavigatorItem_ArchiveLink.php | ||
| SilverStripeNavigatorItem_CMSLink.php | ||
| SilverStripeNavigatorItem_LiveLink.php | ||
| SilverStripeNavigatorItem_StageLink.php | ||
| SilverStripeNavigatorItem.php | ||