Merge remote-tracking branch 'origin/develop'

Author: snipe

app/Http/Controllers/Assets/AssetsController.php

@@ -905,26 +905,7 @@ public function auditStore(UploadFileRequest $request, $id)
         if ($request->input('update_location') == '1') {
             $asset->location_id = $request->input('location_id');
         }
-
-        if (($asset->model->fieldset)) {
-            foreach ($asset->model->fieldset->fields as $field) {
-                if ($field->field_encrypted == '1') {
-                    if (Gate::allows('admin')) {
-                        if (is_array($request->input($field->db_column))) {
-                            $asset->{$field->db_column} = Crypt::encrypt(implode(', ', $request->input($field->db_column)));
-                        } else {
-                            $asset->{$field->db_column} = Crypt::encrypt($request->input($field->db_column));
-                        }
-                    }
-                } else {
-                    if (is_array($request->input($field->db_column))) {
-                        $asset->{$field->db_column} = implode(', ', $request->input($field->db_column));
-                    } else {
-                        $asset->{$field->db_column} = $request->input($field->db_column);
-                    }
-                }
-            }
-        }
+        
 
         /**
          * Invoke Watson Validating to check the asset itself and check to make sure it saved correctly.