Fix issue with enabling sites for sections with Neo fields not managi…

…ng blocks per-site
spicywebau · Jan 26, 2019 · 4e15c37 · 4e15c37
1 parent 3b5ba1f
commit 4e15c37
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.1.8 - 2019-01-26
+### Fixed
+- Fixed multi-site issue, when enabling a site for a section, where a Neo field set not to manage its blocks on a per-site basis would cause the resaving of the section's entries to fail
+
 ## 2.1.7 - 2019-01-25
 ### Fixed
 - Fixed issue where Neo blocks would not appear on duplicated entries

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "spicyweb/craft-neo",
   "description": "A Matrix-like field type that uses existing fields",
-  "version": "2.1.7",
+  "version": "2.1.8",
   "type": "craft-plugin",
   "keywords": [
     "cms",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "craft-neo",
-  "version": "2.1.7",
+  "version": "2.1.8",
   "description": "A Matrix-like field type that uses existing fields",
   "main": "webpack.config.js",
   "scripts": {

diff --git a/src/elements/Block.php b/src/elements/Block.php
@@ -248,11 +248,7 @@ public function getOwner()
 		elseif ($this->ownerId !== null)
 		{
 			$owner = Craft::$app->getElements()->getElementById($this->ownerId, null, $this->siteId);
-
-			if ($owner === null)
-			{
-				$this->_owner = false;
-			}
+			$this->_owner = $owner ?? false;
 		}
 
 		return $owner;