Align AJAX logic: merge custom response last

This is to allow overriding the standard values Refs octobercms#2209
oca159 · Jul 16, 2016 · e970d80 · e970d80
1 parent 09adbbe
commit e970d80
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/modules/backend/classes/Controller.php b/modules/backend/classes/Controller.php
@@ -445,7 +445,7 @@ protected function execAjaxHandlers()
                 if ($this->hasAssetsDefined()) {
                     $responseContents['X_OCTOBER_ASSETS'] = $this->getAssetPaths();
                 }
-                
+
                 /*
                  * If the handler returned an array, we should add it to output for rendering.
                  * If it is a string, add it to the array with the key "result".

diff --git a/modules/cms/classes/Controller.php b/modules/cms/classes/Controller.php
@@ -630,17 +630,6 @@ protected function execAjaxHandlers()
                     throw new CmsException(Lang::get('cms::lang.ajax_handler.not_found', ['name'=>$handler]));
                 }
 
-                /*
-                 * If the handler returned an array, we should add it to output for rendering.
-                 * If it is a string, add it to the array with the key "result".
-                 */
-                if (is_array($result)) {
-                    $responseContents = array_merge($responseContents, $result);
-                }
-                elseif (is_string($result)) {
-                    $responseContents['result'] = $result;
-                }
-
                 /*
                  * Render partials and return the response as array that will be converted to JSON automatically.
                  */
@@ -656,6 +645,17 @@ protected function execAjaxHandlers()
                     $responseContents['X_OCTOBER_REDIRECT'] = $result->getTargetUrl();
                 }
 
+                /*
+                 * If the handler returned an array, we should add it to output for rendering.
+                 * If it is a string, add it to the array with the key "result".
+                 */
+                if (is_array($result)) {
+                    $responseContents = array_merge($responseContents, $result);
+                }
+                elseif (is_string($result)) {
+                    $responseContents['result'] = $result;
+                }
+
                 return Response::make($responseContents, $this->statusCode);
             }
             catch (ValidationException $ex) {