Merge branch 'master' into migrate_to_catalyst

Conflicts:
	.gitignore
	commonlib
	conf/packages
	perllib/FixMyStreet/Map.pm
	templates/website/cobrands/barnet/footer
	web/confirm.cgi
	web/css/core.css
	web/import.cgi
	web/index.cgi

1 files changed, 6 insertions, 2 deletions

diff --git a/web/js.js b/web/js.js
index b2012fc84..07bede2d7 100644
--- a/web/js.js
+++ b/web/js.js
@@ -16,8 +16,12 @@ YAHOO.util.Event.onContentReady('mapForm', function() {
             this.onsubmit = function() { return false; };
         }
 
-        this.x.value = fixmystreet.x + 3;
-        this.y.value = fixmystreet.y + 3;
+        /* XXX Should be in Tilma code only */
+        if (this.x) {
+            this.x.value = fixmystreet.x + 3;
+            this.y.value = fixmystreet.y + 3;
+        }
+
         /*
         if (swfu && swfu.getStats().files_queued > 0) {
             swfu.startUpload();