tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity

simplify code using !empty

Browse Source 
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
This commit is contained in:
maks 2018-08-17 14:51:36 +02:00 committed by GitHub
parent 13625547d3
commit 599e198e89
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/Controllers/ContentController.php
View File

@ -435,8 +435,8 @@ HTML;
public function getViewer($action) public function getViewer($action)
{ {
// Manually set templates should be dealt with by Controller::getViewer() // Manually set templates should be dealt with by Controller::getViewer()
if (isset($this->templates[$action]) && $this->templates[$action] if (!empty($this->templates[$action])
|| (isset($this->templates['index']) && $this->templates['index']) || !empty($this->templates['index'])
|| $this->template || $this->template
) { ) {
return parent::getViewer($action); return parent::getViewer($action);