diff options
author | msquare <msquare@notrademark.de> | 2017-07-19 20:52:31 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-19 20:52:31 +0200 |
commit | 0d772ec9082ef780ec67c239eba61e979143ad05 (patch) | |
tree | ba68d1f00a0c9fb434f24f03eaaf2b7a8a9ec4e2 /includes/model | |
parent | 20e0765f571ed60aa21c07502ee7efcbe9995a6e (diff) | |
parent | 04217834fa4e6f94fec0836a80ea5526b8ebc9bc (diff) |
Merge pull request #326 from MyIgel/master
Reapplied missing commits
Diffstat (limited to 'includes/model')
-rw-r--r-- | includes/model/Room_model.php | 6 | ||||
-rw-r--r-- | includes/model/UserDriverLicenses_model.php | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/includes/model/Room_model.php b/includes/model/Room_model.php index c8399bc4..17617b39 100644 --- a/includes/model/Room_model.php +++ b/includes/model/Room_model.php @@ -57,16 +57,16 @@ function Room_create($name, $from_frab, $public, $number = null) * Returns room by id. * * @param int $room_id RID - * @param bool $show_only + * @param bool $onlyVisible * @return array|false */ -function Room($room_id, $show_only = true) +function Room($room_id, $onlyVisible = true) { $room_source = DB::select(' SELECT * FROM `Room` WHERE `RID` = ? - ' . ($show_only ? 'AND `show` = \'Y\'' : ''), + ' . ($onlyVisible ? 'AND `show` = \'Y\'' : ''), [$room_id] ); diff --git a/includes/model/UserDriverLicenses_model.php b/includes/model/UserDriverLicenses_model.php index 5ff4df35..525d2016 100644 --- a/includes/model/UserDriverLicenses_model.php +++ b/includes/model/UserDriverLicenses_model.php @@ -29,8 +29,8 @@ function UserDriverLicense_new() */ function UserDriverLicense_valid($user_driver_license) { - return $user_driver_license['has_car'] - || $user_driver_license['has_license_car'] + return + $user_driver_license['has_license_car'] || $user_driver_license['has_license_3_5t_transporter'] || $user_driver_license['has_license_7_5t_truck'] || $user_driver_license['has_license_12_5t_truck'] |