2 files changed, 21 insertions, 9 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm b/perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm
index 5b1c4980f..da5b9906e 100644
--- a/perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm
+++ b/perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm
@@ -49,15 +49,9 @@ sub submit : Path('submit') : Args(0) {
     $c->set_param('pc', '');
     $c->set_param('skipped', 1);
 
-    $c->forward('/report/new/initialize_report');
-    $c->forward('/report/new/check_for_category');
-    $c->forward('/auth/check_csrf_token');
-    $c->forward('/report/new/process_report');
-    $c->forward('/report/new/process_user');
-    $c->forward('handle_uploads');
-    $c->forward('/photo/process_photo');
-    $c->go('index', [ 1 ]) unless $c->forward('/report/new/check_for_errors');
-    $c->forward('/report/new/save_user_and_report');
+    $c->forward('/report/new/non_map_creation', [ [ '/contact/enquiry/handle_uploads' ] ])
+        or $c->go('index', [ 1 ]);
+
     $c->forward('confirm_report');
     $c->stash->{success} = 1;
 
diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm
index f5933d754..a00251171 100644
--- a/perllib/FixMyStreet/App/Controller/Report/New.pm
+++ b/perllib/FixMyStreet/App/Controller/Report/New.pm
@@ -1785,6 +1785,24 @@ sub generate_category_extra_json : Private {
     return \@fields;
 }
 
+sub non_map_creation : Private {
+    my ($self, $c, $extras) = @_;
+
+    $c->forward('initialize_report');
+    $c->forward('check_for_category');
+    $c->forward('/auth/check_csrf_token');
+    $c->forward('process_report');
+    $c->forward('process_user');
+    if ($extras) {
+        $c->forward($_) for @$extras;
+    }
+    $c->forward('/photo/process_photo');
+    return 0 unless $c->forward('check_for_errors');
+    $c->forward('save_user_and_report');
+    return 1;
+
+}
+
 __PACKAGE__->meta->make_immutable;
 
 1;