Merge pull request #326 from MyIgel/master

Reapplied missing commits

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']