Skip to content
Snippets Groups Projects
Commit a4211c8a authored by Elmar Ludwig's avatar Elmar Ludwig
Browse files

fix PHP warning, fixes #264

parent 9ec8a116
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 2 additions and 2 deletions
controllers/api.php
+ 2
− 2
View file @ a4211c8a
...@@ -32,7 +32,7 @@ class ApiController extends StudipController ...@@ -32,7 +32,7 @@ class ApiController extends StudipController
'start' => date('d.m.Y, H:i', strtotime($assignment->start)), 'start' => date('d.m.Y, H:i', strtotime($assignment->start)),
'end' => date('d.m.Y, H:i', strtotime($assignment->end)), 'end' => date('d.m.Y, H:i', strtotime($assignment->end)),
'active' => $assignment->active, 'active' => $assignment->active,
'block' => $assignment->block->name 'block' => $assignment->block_id ? $assignment->block->name : null
]; ];
} }
} }
...@@ -70,7 +70,7 @@ class ApiController extends StudipController ...@@ -70,7 +70,7 @@ class ApiController extends StudipController
'start' => date('d.m.Y, H:i', strtotime($assignment->start)), 'start' => date('d.m.Y, H:i', strtotime($assignment->start)),
'end' => date('d.m.Y, H:i', strtotime($assignment->end)), 'end' => date('d.m.Y, H:i', strtotime($assignment->end)),
'active' => $assignment->active, 'active' => $assignment->active,
'block' => $assignment->block->name, 'block' => $assignment->block_id ? $assignment->block->name : null,
'reset_allowed' => $assignment->isRunning($user_id) && $assignment->isResetAllowed(), 'reset_allowed' => $assignment->isRunning($user_id) && $assignment->isResetAllowed(),
'points' => $assignment->test->getTotalPoints(), 'points' => $assignment->test->getTotalPoints(),
'release_status' => $released, 'release_status' => $released,
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment