Merge pull request #1538 from nowackipawel/patch-21

WIP img fix(?) - html_helper
codeigniter4 · Jan 3, 2019 · bfc1569 · bfc1569
2 parents 936f807 + a5b93ab
commit bfc1569
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/system/Helpers/html_helper.php b/system/Helpers/html_helper.php
@@ -156,12 +156,12 @@ function img($src = '', bool $indexPage = false, $attributes = ''): string
 			$src = ['src' => $src];
 		}
 
-		//If there is no alt attribute defined, set it to an empty string.
 		if (! isset($src['alt']))
 		{
-			$src['alt'] = '';
+			$src['alt'] = $attributes['alt'] ?? '';
 		}
 
+
 		$img = '<img';
 
 		foreach ($src as $k => $v)
@@ -184,6 +184,12 @@ function img($src = '', bool $indexPage = false, $attributes = ''): string
 			}
 		}
 
+		// prevent passing "alt" to stringify_attributes
+		if(is_array($attributes) && isset($attributes['alt']))
+		{
+			unset($attributes['alt']);
+		}
+
 		return $img . stringify_attributes($attributes) . ' />';
 	}
 }