[OpenLayers] Never send X-Requested-With header.

3 files changed, 15 insertions, 22 deletions

diff --git a/web/cobrands/fixmystreet-uk-councils/roadworks.js b/web/cobrands/fixmystreet-uk-councils/roadworks.js
index f4da4c310..2b0de306a 100644
--- a/web/cobrands/fixmystreet-uk-councils/roadworks.js
+++ b/web/cobrands/fixmystreet-uk-councils/roadworks.js
@@ -222,16 +222,4 @@ fixmystreet.roadworks.display_message = function(feature) {
     $msg.prependTo('#js-post-category-messages');
 };
 
-/* Stop sending a needless header so that no preflight CORS request */
-OpenLayers.Request.XMLHttpRequest.prototype.setRequestHeader = function(sName, sValue) {
-    if (sName.toLowerCase() == 'x-requested-with') {
-        return;
-    }
-    if (!this._headers) {
-        this._headers = {};
-    }
-    this._headers[sName] = sValue;
-    return this._object.setRequestHeader(sName, sValue);
-};
-
 })();
diff --git a/web/cobrands/fixmystreet/assets.js b/web/cobrands/fixmystreet/assets.js
index c30fa2b5e..fd18bb34a 100644
--- a/web/cobrands/fixmystreet/assets.js
+++ b/web/cobrands/fixmystreet/assets.js
@@ -944,16 +944,6 @@ OpenLayers.Format.GML.v3.MultiCurveFix = OpenLayers.Class(OpenLayers.Format.GML.
     CLASS_NAME: "OpenLayers.Format.GML.v3.MultiCurveFix"
 });
 
-OpenLayers.Request.XMLHttpRequest.prototype.setRequestHeader = function(sName, sValue) {
-    if (sName.toLowerCase() == 'x-requested-with') {
-        return;
-    }
-    if (!this._headers) {
-        this._headers = {};
-    }
-    this._headers[sName] = sValue;
-    return this._object.setRequestHeader(sName, sValue);
-};
 })();
 
 /* Handling of body override functionality */
diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js
index cd2283491..4e4201d3a 100644
--- a/web/js/map-OpenLayers.js
+++ b/web/js/map-OpenLayers.js
@@ -562,6 +562,9 @@ $.extend(fixmystreet.utils, {
                 } else {
                     $.extend(style.defaultStyle, { fillColor: 'black', strokeColor: 'black' });
                 }
+                if (!this.features.length) {
+                    return;
+                }
                 var geometry = this.features[0].geometry;
                 if (geometry.CLASS_NAME == 'OpenLayers.Geometry.Collection' ||
                     geometry.CLASS_NAME == 'OpenLayers.Geometry.MultiPolygon') {
@@ -1185,3 +1188,15 @@ OpenLayers.Renderer.SVGBig = OpenLayers.Class(OpenLayers.Renderer.SVG, {
     CLASS_NAME: "OpenLayers.Renderer.SVGBig"
 
 });
+
+/* Stop sending a needless header so that no preflight CORS request */
+OpenLayers.Request.XMLHttpRequest.prototype.setRequestHeader = function(sName, sValue) {
+    if (sName.toLowerCase() == 'x-requested-with') {
+        return;
+    }
+    if (!this._headers) {
+        this._headers = {};
+    }
+    this._headers[sName] = sValue;
+    return this._object.setRequestHeader(sName, sValue);
+};