Add exception to hook - refs BT#9438

main/auth/courses_controller.php

@@ -502,10 +502,13 @@ class CoursesController
         $hook = HookResubscribe::create();
         if (!empty($hook)) {
             $hook->setEventData(array(
-                'session_id' => intval($sessionData),
-                'result' => &$result
+                'session_id' => intval($sessionData)
             ));
+            try {
                 $hook->notifyResubscribe(HOOK_EVENT_TYPE_PRE);
+            } catch (Exception $exception) {
+                $result = $exception->getMessage();
+            }
         }
 
         return $result;

plugin/resubscription/src/HookResubscription.php

@@ -86,10 +86,9 @@ class HookResubscription extends HookObserver implements HookResubscribeObserver
                 if (isset($userSessionCourses[$currentSessionCourse['course_code']])) {
                     $endDate = $userSessionCourses[$currentSessionCourse['course_code']];
                     $resubscriptionDate = gmdate('Y-m-d', strtotime($endDate." +$resubscriptionLimit year"));
-
                     $icon = Display::return_icon('students.gif', get_lang('Student'));
                     $canResubscribeFrom = sprintf(get_plugin_lang('CanResubscribeFromX', 'resubscription'), $resubscriptionDate);
-                    $data['result'] = Display::label($icon . ' ' . $canResubscribeFrom, "info");
+                    throw new Exception(Display::label($icon . ' ' . $canResubscribeFrom, "info"));
                 }
             }
         }