diff options
| author | Christian Klinger | 2016-08-22 11:24:03 +0200 |
|---|---|---|
| committer | Christian Klinger | 2016-08-22 11:24:03 +0200 |
| commit | d3c689c6730ca6749c03ffd01c670f7b191e8355 (patch) | |
| tree | 9e2d7caa1ed3c45b4757621202087a64e5e87cc9 /modules-available/locations/inc/location.inc.php | |
| parent | css fix/hack to get roomplanner to work on medium sized screens. (diff) | |
| parent | [dozmod] Expect the client to tell wether it is running in exam mode and comp... (diff) | |
| download | slx-admin-d3c689c6730ca6749c03ffd01c670f7b191e8355.tar.gz slx-admin-d3c689c6730ca6749c03ffd01c670f7b191e8355.tar.xz slx-admin-d3c689c6730ca6749c03ffd01c670f7b191e8355.zip | |
Merge branch 'modularization' of git.openslx.org:openslx-ng/slx-admin into modularization
Diffstat (limited to 'modules-available/locations/inc/location.inc.php')
| -rw-r--r-- | modules-available/locations/inc/location.inc.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/modules-available/locations/inc/location.inc.php b/modules-available/locations/inc/location.inc.php index a018208d..71a621db 100644 --- a/modules-available/locations/inc/location.inc.php +++ b/modules-available/locations/inc/location.inc.php @@ -362,8 +362,7 @@ class Location private static function overlap($net1, $net2) { - return ($net1['startaddr'] >= $net2['startaddr'] && $net1['startaddr'] <= $net2['endaddr']) - || ($net1['endaddr'] >= $net2['startaddr'] && $net1['endaddr'] <= $net2['endaddr']); + return ($net1['startaddr'] <= $net2['endaddr'] && $net1['endaddr'] >= $net2['startaddr']); } } |