optimizations and minor fixes for user_shifts and admin_user

1 files changed, 6 insertions, 2 deletions

diff --git a/includes/pages/admin_user.php b/includes/pages/admin_user.php
index 5f2bdbe6..94e90a24 100644
--- a/includes/pages/admin_user.php
+++ b/includes/pages/admin_user.php
@@ -102,8 +102,12 @@ function admin_user() {
         $angel_types[$angel_type['id']] = $angel_type['name'];
 
       if (isset ($_REQUEST['submit_user_angeltypes'])) {
-        $selected_angel_types = array_intersect($_REQUEST['selected_angel_types'], array_keys($angel_types));
-        $accepted_angel_types = array_unique(array_diff(array_intersect($_REQUEST['accepted_angel_types'], array_keys($angel_types)), $nonrestricted_angel_types));
+        $selected_angel_types = isset($_REQUEST['selected_angel_types']) && is_array($_REQUEST['selected_angel_types'])?
+          array_intersect($_REQUEST['selected_angel_types'], array_keys($angel_types))
+          : array();
+        $accepted_angel_types = isset($_REQUEST['accepted_angel_types']) && is_array($_REQUEST['accepted_angel_types'])?
+          array_unique(array_diff(array_intersect($_REQUEST['accepted_angel_types'], array_keys($angel_types)), $nonrestricted_angel_types))
+          : array();
         if (in_array("admin_user_angeltypes", $privileges))
           $selected_angel_types = array_merge((array) $selected_angel_types, $accepted_angel_types);
         $selected_angel_types = array_unique($selected_angel_types);