Adding "jpeg" extension support to isImage() function.

OPL · Sep 1, 2010 · 30d1fae · 30d1fae
1 parent eecffb1
commit 30d1fae
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/lib/Function.php b/lib/Function.php
@@ -597,7 +597,7 @@ static public function isImage($address)
 					// Try to obtain the file extension
 					if(($id = strrpos($result['path'], '.')) !== false)
 					{
-						if(in_array(substr($result['path'], $id+1, 3), array('jpg', 'png', 'gif', 'svg', 'bmp')))
+						if(in_array(substr($result['path'], $id+1, 3), array('jpg', 'png', 'gif', 'svg', 'bmp')) || in_array(substr($result['path'], $id+1, 4), array('jpeg')))
 						{
 							return true;
 						}

diff --git a/tests/function/isimage_1.txt b/tests/function/isimage_1.txt
@@ -8,6 +8,7 @@ Check the isImage() function.
 <opt:if test="isImage('foo.gif')">IMAGE<opt:else>NOT IMAGE</opt:else></opt:if>
 <opt:if test="isImage('foo.svg')">IMAGE<opt:else>NOT IMAGE</opt:else></opt:if>
 <opt:if test="isImage('foo.bmp')">IMAGE<opt:else>NOT IMAGE</opt:else></opt:if>
+<opt:if test="isImage('foo.jpeg')">IMAGE<opt:else>NOT IMAGE</opt:else></opt:if>
 <opt:if test="isImage('http://www.example.com/image.png')">IMAGE<opt:else>NOT IMAGE</opt:else></opt:if>
 <opt:if test="isImage('bogus')">IMAGE<opt:else>NOT IMAGE</opt:else></opt:if>
 </opt:root>
@@ -22,4 +23,5 @@ IMAGE
 IMAGE
 IMAGE
 IMAGE
+IMAGE
 NOT IMAGE