Merge branch 'v2-dev' into v2

ethercreative · Nov 30, 2017 · d007a31 · d007a31
2 parents c6fb7ed + 8f50c0d
commit d007a31
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -113,6 +113,9 @@ Lat/Lng, to display it on a map.
 
 ## Changelog
 
+### 1.8.1
+- Fixed bug where maps didn't save
+
 ### 1.8.0
 - The maps `parts` now contains all available options from [here](https://developers.google.com/maps/documentation/geocoding/intro#Types) (including the `_small` variants). Any options without values are returned as empty strings.
 - Added `craft.simpleMap.getLatLngFromAddress($addressString[, $country])`.

diff --git a/releases.json b/releases.json
@@ -201,5 +201,13 @@
       "[Added] Added `craft.simpleMap.getLatLngFromAddress($addressString[, $country])`.",
       "[Improved] The maps `parts` now contains all available options from [here](https://developers.google.com/maps/documentation/geocoding/intro#Types) (including the `_small` variants). Any options without values are returned as empty strings."
     ]
+  },
+  {
+    "version": "1.8.1",
+    "downloadUrl": "https://github.com/ethercreative/simplemap/archive/v1.8.1.zip",
+    "date": "2017-11-30T18:20:00-08:00",
+    "notes": [
+      "[Fixed] Fixed bug where maps didn't save"
+    ]
   }
 ]
diff --git a/simplemap/SimpleMapPlugin.php b/simplemap/SimpleMapPlugin.php
@@ -24,7 +24,7 @@ public function getDescription()
 
 	public function getVersion()
 	{
-		return '1.8.0';
+		return '1.8.1';
 	}
 
 	public function getSchemaVersion()

diff --git a/simplemap/services/SimpleMapService.php b/simplemap/services/SimpleMapService.php
@@ -428,7 +428,7 @@ private function _calculateDistance (SimpleMap_MapModel $model)
 
 	private function _padParts (SimpleMap_MapModel $model)
 	{
-		$parts = $model->parts;
+		$parts = $model->parts ?: [];
 
 		foreach (self::$_parts as $part) {
 			if (!array_key_exists($part, $parts)) {