diff options
| author | Simon Rettberg | 2023-11-02 19:08:58 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2023-11-02 19:08:58 +0100 |
| commit | c2d95ffaeaa289752b4c7b6664b6ca112a02e350 (patch) | |
| tree | 2c29b0157d14198aadbdbc9f8c18ded0bd4dadcd /modules-available/locations/inc | |
| parent | [rebootcontrol] Remove API prototype (diff) | |
| download | slx-admin-c2d95ffaeaa289752b4c7b6664b6ca112a02e350.tar.gz slx-admin-c2d95ffaeaa289752b4c7b6664b6ca112a02e350.tar.xz slx-admin-c2d95ffaeaa289752b4c7b6664b6ca112a02e350.zip | |
Roundup of issues reported by PHPStorm
Mostly redundant checks, logic errors, dead code, etc.
Diffstat (limited to 'modules-available/locations/inc')
| -rw-r--r-- | modules-available/locations/inc/location.inc.php | 3 | ||||
| -rw-r--r-- | modules-available/locations/inc/locationutil.inc.php | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/modules-available/locations/inc/location.inc.php b/modules-available/locations/inc/location.inc.php index db4580be..f68d6821 100644 --- a/modules-available/locations/inc/location.inc.php +++ b/modules-available/locations/inc/location.inc.php @@ -254,8 +254,7 @@ class Location . 'FROM location ' . 'WHERE parentlocationid = :locationid', ['locationid' => $locationid]); $result = $result['isleaf']; - $result = (bool)$result; - return $result; + return (bool)$result; } public static function extractIds($tree) diff --git a/modules-available/locations/inc/locationutil.inc.php b/modules-available/locations/inc/locationutil.inc.php index acdaed2f..907bcc99 100644 --- a/modules-available/locations/inc/locationutil.inc.php +++ b/modules-available/locations/inc/locationutil.inc.php @@ -48,7 +48,7 @@ class LocationUtil if ($overlapOther) { $overlapOther = array(); foreach ($other as $entry) { - if (!isset($locs[$entry['lid1']]) || !isset($locs[$entry['lid2']])) + if (!isset($locs[$entry['lid1']]) && !isset($locs[$entry['lid2']])) continue; if (in_array($entry['lid1'], $locs[$entry['lid2']]['parents']) || in_array($entry['lid2'], $locs[$entry['lid1']]['parents'])) continue; |