Apply ResponseMaker to backend AJAX and cms.page.display event

modules/backend/classes/Controller.php

@@ -232,24 +232,24 @@ class Controller extends Extendable
          * Execute AJAX event
          */
         if ($ajaxResponse = $this->execAjaxHandlers()) {
-            return $ajaxResponse;
+            $result = $ajaxResponse;
         }
-
         /*
          * Execute postback handler
          */
-        if (
+        elseif (
             ($handler = post('_handler')) &&
             ($handlerResponse = $this->runAjaxHandler($handler)) &&
             $handlerResponse !== true
         ) {
-            return $handlerResponse;
+            $result = $handlerResponse;
         }
-
         /*
          * Execute page action
          */
+        else {
             $result = $this->execPageAction($action, $params);
+        }
 
         /*
          * Prepare and return response

modules/cms/classes/Controller.php

@@ -263,7 +263,7 @@ class Controller
          *
          */
         if ($event = $this->fireSystemEvent('cms.page.display', [$url, $page, $result])) {
-            return $event;
+            $result = $event;
         }
 
         /*