Merge remote-tracking branch 'upstream/develop'

kimai · Aug 22, 2016 · d08d534 · d08d534
2 parents 48b3b5c + 1f545ee
commit d08d534
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/core/floaters.php b/core/floaters.php
@@ -248,9 +248,11 @@
                 $view->assign('selectedProjectIds', $selectedProjectIds);
 
                 $selectedProjects = $database->activity_get_projects($id);
-                foreach ($selectedProjects as &$selectedProject) {
-                    // edit by reference!
-                    $selectedProject['fixedRate'] = $database->get_fixed_rate($selectedProject['projectID'], $id);
+                if (is_array($selectedProjects)) {
+                    foreach ($selectedProjects as &$selectedProject) {
+                        // edit by reference!
+                        $selectedProject['fixedRate'] = $database->get_fixed_rate($selectedProject['projectID'], $id);
+                    }
                 }
                 $view->assign('selectedProjects', $selectedProjects);
                 $view->assign('id', $id);