Merge pull request #316 from Floddy/oneparamimages

maxiloc · maxiloc · commit 6d8a2b905d46 · 2016-02-11T11:21:47.000+01:00
If a config value for image size is empty, return null
diff --git a/code/Helper/Config.php b/code/Helper/Config.php
@@ -123,12 +123,20 @@ public function noProcess($storeId = null)
 
     public function getImageWidth($storeId = null)
     {
-        return Mage::getStoreConfig(self::XML_PATH_IMAGE_WIDTH, $storeId);
+        $imageWidth = Mage::getStoreConfig(self::XML_PATH_IMAGE_WIDTH, $storeId);
+        if(empty($imageWidth)) {
+            return null;
+        }
+        return $imageWidth;
     }
 
     public function getImageHeight($storeId = null)
     {
-        return Mage::getStoreConfig(self::XML_PATH_IMAGE_HEIGHT, $storeId);
+        $imageHeight = Mage::getStoreConfig(self::XML_PATH_IMAGE_HEIGHT, $storeId);
+        if(empty($imageHeight)) {
+            return null;
+        }
+        return $imageHeight;
     }
 
     public function getImageType($storeId = null)

Original file line number	Diff line number	Diff line change
`@@ -123,12 +123,20 @@ public function noProcess($storeId = null)`
`123`	`123`
`124`	`124`	`public function getImageWidth($storeId = null)`
`125`	`125`	`{`
`126`		`- return Mage::getStoreConfig(self::XML_PATH_IMAGE_WIDTH, $storeId);`
	`126`	`+ $imageWidth = Mage::getStoreConfig(self::XML_PATH_IMAGE_WIDTH, $storeId);`
	`127`	`+ if(empty($imageWidth)) {`
	`128`	`+ return null;`
	`129`	`+ }`
	`130`	`+ return $imageWidth;`
`127`	`131`	`}`
`128`	`132`
`129`	`133`	`public function getImageHeight($storeId = null)`
`130`	`134`	`{`
`131`		`- return Mage::getStoreConfig(self::XML_PATH_IMAGE_HEIGHT, $storeId);`
	`135`	`+ $imageHeight = Mage::getStoreConfig(self::XML_PATH_IMAGE_HEIGHT, $storeId);`
	`136`	`+ if(empty($imageHeight)) {`
	`137`	`+ return null;`
	`138`	`+ }`
	`139`	`+ return $imageHeight;`
`132`	`140`	`}`
`133`	`141`
`134`	`142`	`public function getImageType($storeId = null)`