Merge pull request #9 from timgatzky/dev

Dev
timgatzky · Dec 14, 2017 · 570d92f · 570d92f
2 parents 4ca07f5 + c893c2f
commit 570d92f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/system/modules/pct_image_crop/PCT/ImageCrop/Core.php b/system/modules/pct_image_crop/PCT/ImageCrop/Core.php
@@ -48,6 +48,11 @@ public function getContentElementCallback($objRow,$strBuffer,$objElement)
 		 	$intId = $objElement->cteAlias;
 	 	}
 
+	 	if($objElement->type == 'text' && !$objElement->addImage)
+	 	{
+		 	return $strBuffer;
+	 	}
+
 	 	$strField = 'pct_image_crop_data';
 	 	$arrFieldDef = $GLOBALS['TL_DCA']['tl_content']['fields'][$strField];
 		$strSourceField = $arrFieldDef['eval']['cropper']['sourceField'];
@@ -94,8 +99,18 @@ public function prepareRenderingCallback($strField,$varValue,$objTemplate,$objAt
 	 	}
 
 	 	$arrOptionValues = $objAttribute->get('arrOptionValues');
+	 	if(empty($arrOptionValues['cropperdata']))
+	 	{
+		 	return $strBuffer;
+	 	}
+
 	 	$objData = json_decode($arrOptionValues['cropperdata']);
 
+	 	if(empty($objData->src))
+	 	{
+		 	return $strBuffer;
+	 	}
+
 	 	// add the file to file database, just in case it is not yet
 	 	$objFile = \Dbafs::addResource($objData->src);
 

diff --git a/system/modules/pct_image_crop/changelog.txt b/system/modules/pct_image_crop/changelog.txt
@@ -1,3 +1,7 @@
+### 1.2.1
+Fixed: Skip images without the cropper option (#7) 
+Update: Check if addImage option is set in text content elements before regenerating the element
+
 ### 1.2.0
 Update: Image crop [cropperdata] is now a visible option in image attributes