iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

$bugfixes...

This commit is contained in:
Igor Scheller 2018-01-14 18:47:15 +01:00
parent 5227fe6a94
commit 646ffc1910
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
includes/controller/event_config_controller.php
View File

@ -28,7 +28,7 @@ function event_config_edit_controller()
$teardown_end_date = null; $teardown_end_date = null;
$event_config = EventConfig(); $event_config = EventConfig();
if (empty($event_config)) { if (!empty($event_config)) {
$event_name = $event_config['event_name']; $event_name = $event_config['event_name'];
$buildup_start_date = $event_config['buildup_start_date']; $buildup_start_date = $event_config['buildup_start_date'];
$event_start_date = $event_config['event_start_date']; $event_start_date = $event_config['event_start_date'];

3
includes/sys_page.php
View File

@ -42,9 +42,10 @@ function check_request_datetime($date_name, $time_name, $allowed_days, $default_
function parse_date($pattern, $value) function parse_date($pattern, $value)
{ {
$datetime = DateTime::createFromFormat($pattern, trim($value)); $datetime = DateTime::createFromFormat($pattern, trim($value));
if (is_null($datetime)) { if (!$datetime) {
return null; return null;
} }
return $datetime->getTimestamp(); return $datetime->getTimestamp();
} }

4
tests/Feature/Model/RoomModelTest.php
View File

@ -24,11 +24,11 @@ class RoomModelTest extends TestCase
$room = Room($this->room_id); $room = Room($this->room_id);
$this->assertNotFalse($room); $this->assertNotEmpty($room);
$this->assertNotNull($room); $this->assertNotNull($room);
$this->assertEquals($room['Name'], 'test'); $this->assertEquals($room['Name'], 'test');
$this->assertNull(Room(-1)); $this->assertEmpty(Room(-1));
} }
public function tearDown() public function tearDown()