Merge branch 'master' into osm

Conflicts: notes/2.12.md
2012-01-17 09:10:27 +01:00
parent e160628086 0aaa5265b4
commit 8f57e34376
17 changed files with 256 additions and 21 deletions
@@ -120,6 +120,7 @@ OpenLayers.Layer.HTTPRequest = OpenLayers.Class(OpenLayers.Layer, {
     */
    mergeNewParams:function(newParams) {
        this.params = OpenLayers.Util.extend(this.params, newParams);
+        this.resolution = null;
        var ret = this.redraw();
        if(this.map != null) {
            this.map.events.triggerEvent("changelayer", {
@@ -144,7 +145,7 @@ OpenLayers.Layer.HTTPRequest = OpenLayers.Class(OpenLayers.Layer, {
        if (force) {
            return this.mergeNewParams({"_olSalt": Math.random()});
        } else {
-            return OpenLayers.Layer.prototype.redraw.apply(this, []);
+            return OpenLayers.Layer.prototype.redraw.call(this);
        }
    },