Fix for generated srcset where the size being requested isn't a defin…

…ed size.
Interfacelab · Oct 31, 2018 · ecb5c31 · ecb5c31
1 parent 86eff4e
commit ecb5c31
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 10 deletions.
diff --git a/classes/Tools/Imgix/ImgixTool.php b/classes/Tools/Imgix/ImgixTool.php
@@ -539,7 +539,7 @@ private function buildImgixImage($id, $size, $params = null, $skipParams = false
 			}
 		}
 
-		if($sizeInfo['crop']) {
+		if(isset($sizeInfo['crop'])) {
 			$params['w'] = $sizeInfo['width'] ?: $sizeInfo['height'];
 			$params['h'] = $sizeInfo['height'] ?: $sizeInfo['width'];
 			$params['fit'] = 'crop';
@@ -631,7 +631,13 @@ private function buildImgixImage($id, $size, $params = null, $skipParams = false
 				unset($params['fp-z']);
             }
 		} else {
-			$newSize = sizeToFitSize($meta['width'], $meta['height'], $sizeInfo['width'] ?: 10000, $sizeInfo['height'] ?: 10000);
+            $mw = (isset($meta['width'])) ? $meta['width'] : 10000;
+            $mh = (isset($meta['height'])) ? $meta['height'] : 10000;
+
+            $w = (isset($sizeInfo['width'])) ? $sizeInfo['width'] : 10000;
+            $h = (isset($sizeInfo['height'])) ? $sizeInfo['height'] : 10000;
+
+			$newSize = sizeToFitSize($mw, $mh, $w, $h);
 			$params['w'] = $newSize[0];
 			$params['h'] = $newSize[1];
 			$params['fit'] = 'scale';

diff --git a/classes/Tools/Storage/StorageTool.php b/classes/Tools/Storage/StorageTool.php
@@ -715,16 +715,23 @@ public function calculateSrcSet($sources, $size_array, $image_src, $image_meta,
 			return $sources;
 		}
 
+		$allSizes = ilab_get_image_sizes();
+		$allSizesNames = array_keys($allSizes);
+
 		foreach($image_meta['sizes'] as $sizeName => $sizeData) {
 			$width = $sizeData['width'];
-			if(isset($sources[$width])) {
-				$src = wp_get_attachment_image_src($attachment_id, $sizeName);
-
-				if(is_array($src)) {
-					$sources[$width]['url'] = $src[0];
-				} else {
-					unset($sources[$width]);
-				}
+			if (isset($sources[$width])) {
+			    if (in_array($sizeName, $allSizesNames)) {
+                    $src = wp_get_attachment_image_src($attachment_id, $sizeName);
+
+                    if(is_array($src)) {
+                        $sources[$width]['url'] = $src[0];
+                    } else {
+                        unset($sources[$width]);
+                    }
+                } else {
+                    unset($sources[$width]);
+                }
 			}
 		}