Hopefully fix #1053

3 files changed, 6 insertions, 7 deletions

diff --git a/bin/test-run b/bin/test-run
index 8c309c15d..5607bb5ef 100755
--- a/bin/test-run
+++ b/bin/test-run
@@ -18,7 +18,7 @@
 #   Admin
 #   Whatever I've missed!
 
-my $rcsid = ''; $rcsid .= '$Id: test-run,v 1.25 2009-09-28 15:31:00 louise Exp $';
+my $rcsid = ''; $rcsid .= '$Id: test-run,v 1.26 2009-10-22 15:10:51 matthew Exp $';
 
 use strict;
 require 5.8.0;
@@ -230,7 +230,7 @@ sub submit_report {
                         'tile_' . $x . '.' . $y . '.y' =>   158,
                         submit_map => 1});
         $wth->browser_check_contents('<h1>' . $messages[1] . '</h1>');
-        my $fields = { submit_map => 2,
+        my $fields = { submit_problem => 'Submit',
                         x => $x,
                         y => $y,
                         pc => $postcode,
diff --git a/web/index.cgi b/web/index.cgi
index 8afbdb684..9ed2664fe 100755
--- a/web/index.cgi
+++ b/web/index.cgi
@@ -6,7 +6,7 @@
 # Copyright (c) 2006 UK Citizens Online Democracy. All rights reserved.
 # Email: matthew@mysociety.org. WWW: http://www.mysociety.org
 #
-# $Id: index.cgi,v 1.302 2009-10-21 15:11:38 louise Exp $
+# $Id: index.cgi,v 1.303 2009-10-22 15:10:51 matthew Exp $
 
 use strict;
 use Standard;
@@ -69,7 +69,7 @@ sub main {
 
     my $out = '';
     my %params;
-    if ($q->param('submit_problem') || ($q->param('submit_map') && $q->param('submit_map')==2)) {
+    if ($q->param('submit_problem')) {
         $params{title} = _('Submitting your report');
         ($out) = submit_problem($q);
     } elsif ($q->param('submit_update')) {
diff --git a/web/js.js b/web/js.js
index e2862db4d..9cc536728 100644
--- a/web/js.js
+++ b/web/js.js
@@ -54,10 +54,9 @@ YAHOO.util.Event.onContentReady('map', function() {
 YAHOO.util.Event.onContentReady('mapForm', function() {
     this.onsubmit = function() {
        if (this.submit_problem) {
-            this.submit_problem.disabled = true;
-            this.submit_map.value = 2;
+            this.onsubmit = function() { return false; };
         }
-        
+
         this.x.value = fms_x + 2;
         this.y.value = fms_y + 2;
         /*