@@ -16,6 +16,7 @@
 use ProcessMaker\Http\Resources\ProcessRequests;
 use ProcessMaker\Jobs\ExportProcess;
 use ProcessMaker\Jobs\ImportProcess;
+use ProcessMaker\Managers\ExportManager;
 use ProcessMaker\Models\Process;
 use ProcessMaker\Models\ProcessCategory;
 use ProcessMaker\Models\ProcessPermission;
@@ -28,6 +29,7 @@
 use ProcessMaker\Package\WebEntry\Models\WebentryRoute;
 use ProcessMaker\Providers\WorkflowServiceProvider;
 use ProcessMaker\Rules\BPMNValidation;
+use ProcessMaker\SanitizeHelper;
 use Throwable;
 
 class ProcessController extends Controller
 
@@ -314,7 +314,7 @@ public function update(Request $request, ProcessRequestToken $task)
             }
             // Skip ConvertEmptyStringsToNull and TrimStrings middlewares
             $data = json_decode($request->getContent(), true);
-            $data = SanitizeHelper::sanitizeData($data['data'], $task);
+            $data = SanitizeHelper::sanitizeData($data['data'], $task->processRequest->do_not_sanitize);
             //Call the manager to trigger the start event
             $process = $task->process;
             $instance = $task->processRequest;
 
@@ -99,35 +99,8 @@ private static function convertTagToRegExp($tag)
      *
      * @return string
      */
-    public static function sanitizeData($data, $task)
+    public static function sanitizeData($data, $except = [])
     {
-        // Get current and nested screens IDs ..
-        $currentScreenExceptions = [];
-        $currentScreenAndNestedIds = $task->getScreenAndNestedIds();
-        foreach ($currentScreenAndNestedIds as $id) {
-            // Find the screen version ..
-            $screen = Screen::findOrFail($id);
-            $screen = $screen->versionFor($task->processRequest)->toArray();
-            // Get exceptions ..
-            $exceptions = self::getExceptions((object) $screen);
-            if (count($exceptions)) {
-                $currentScreenExceptions = array_unique(array_merge($exceptions, $currentScreenExceptions));
-            }
-        }
-
-        // Get process request exceptions stored in do_not_sanitize column ..
-        $processRequestExceptions = $task->processRequest->do_not_sanitize;
-        if (!$processRequestExceptions) {
-            $processRequestExceptions = [];
-        }
-
-        // Merge (nestedSreensExceptions and currentScreenExceptions) with processRequestExceptions ..
-        $except = array_unique(array_merge($processRequestExceptions, $currentScreenExceptions));
-
-        // Update database with all the exceptions ..
-        $task->processRequest->do_not_sanitize = $except;
-        $task->processRequest->save();
-
         return self::sanitizeWithExceptions($data, $except);
     }
Original file line number	Diff line number	Diff line change
`@@ -314,7 +314,7 @@ public function update(Request $request, ProcessRequestToken $task)`
`314`	`314`	`}`
`315`	`315`	`// Skip ConvertEmptyStringsToNull and TrimStrings middlewares`
`316`	`316`	`$data = json_decode($request->getContent(), true);`
`317`		`- $data = SanitizeHelper::sanitizeData($data['data'], $task);`
	`317`	`+ $data = SanitizeHelper::sanitizeData($data['data'], $task->processRequest->do_not_sanitize);`
`318`	`318`	`//Call the manager to trigger the start event`
`319`	`319`	`$process = $task->process;`
`320`	`320`	`$instance = $task->processRequest;`