Merge branch '2.12'

2012-05-10 15:54:54 +02:00
parent cadb20c18a 293ad9b32a
commit be6c90ed49
3 changed files with 3 additions and 3 deletions
--- a/lib/OpenLayers.js
+++ b/lib/OpenLayers.js
@@ -414,4 +414,4 @@
 /**
 * Constant: VERSION_NUMBER
 */
-OpenLayers.VERSION_NUMBER="Release 2.12-rc2";
+OpenLayers.VERSION_NUMBER="Release 2.12-rc3";
--- a/lib/OpenLayers/Layer.js
+++ b/lib/OpenLayers/Layer.js
@@ -1015,7 +1015,7 @@ OpenLayers.Layer = OpenLayers.Class({
           this.maxExtent != null) {
            // maxResolution for default grid sets assumes that at zoom
            // level zero, the whole world fits on one tile.
-            var tileSize = this.tileSize || this.map.getTileSize();
+            var tileSize = this.map.getTileSize();
            maxResolution = Math.max(
                this.maxExtent.getWidth() / tileSize.w,
                this.maxExtent.getHeight() / tileSize.h
--- a/lib/OpenLayers/SingleFile.js
+++ b/lib/OpenLayers/SingleFile.js
@@ -7,7 +7,7 @@ var OpenLayers = {
    /**
     * Constant: VERSION_NUMBER
     */
-    VERSION_NUMBER: "Release 2.12-rc2",
+    VERSION_NUMBER: "Release 2.12-rc3",

    /**
     * Constant: singleFile