[TASK] Add object option for setting up ajax env

Classes/Controller/ActionController.php

@@ -584,6 +584,7 @@ class ActionController extends BaseController
             ->getUriBuilder()
             ->reset()
             ->setCreateAbsoluteUri(true)
+            ->setAddQueryString(true)
             ->setTargetPageType($this->ajaxPageType)
             ->setArguments(['cid' => $this->contentObjectUid])
             ->uriFor($this->request->getControllerActionName());
@@ -697,9 +698,12 @@ class ActionController extends BaseController
      * @param array $result
      * @return void
      */
-    protected function returnFunction($result = [], $errorStatus = null)
+    protected function returnFunction(
-    {
+        $result      = [],
-        $this->setAjaxEnv();
+        $errorStatus = null,
+        $object      = 'data'
+    ) {
+        $this->setAjaxEnv($object);
         if ($result == null) {
             $result = [];
         }

Classes/Utility/MailUtility.php

@@ -138,7 +138,6 @@ class MailUtility
                     $htmlRow['data'] = preg_replace_callback(
                         '/\[.*\]/mU',
                         function($matches) {
-
                             foreach ($matches as $match) {
                                 return preg_replace_callback(
                                     '/\[(\S*)\s(.*)\]/mU',