Issue #46: Prevent fatal error on waitlist registration.

backdrop-contrib · Jan 31, 2025 · f35ea69 · f35ea69
1 parent 574d76b
commit f35ea69
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/includes/registration.forms.inc b/includes/registration.forms.inc
@@ -167,7 +167,7 @@ function registration_form($form, &$form_state, Registration $registration) {
     );
   }
 
-  if ($host && entity_access('view', $registration->entity_type, $host)) {
+  if ($host && entity_plus_access('view', $registration->entity_type, $host)) {
     $uri = entity_uri($registration->entity_type, $host);
     if (isset($uri['path'])) {
       $form['actions']['cancel'] = array(

diff --git a/registration.module b/registration.module
@@ -1849,8 +1849,8 @@ function registration_get_default_state($type = NULL) {
  *   If set, the type with the given name is returned.
  */
 function registration_get_states($name = NULL) {
-  $types = entity_load_multiple_by_name('registration_state', isset($name) ? array($name) : FALSE);
-  return isset($name) ? reset($types) : $types;
+  $types = entity_load_multiple_by_name('registration_state', FALSE);
+  return (isset($name) && !empty($types[$name])) ? $types[$name] : $types;
 }
 
 /**