Item8621: the mapping using _filetypes.txt was wrong

git-svn-id: http://svn.foswiki.org/trunk@6550 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Feb 26, 2010 · 87b9ab8 · 87b9ab8
1 parent b64f428
commit 87b9ab8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/UnitTestContrib/test/unit/Fn_ICON.pm b/UnitTestContrib/test/unit/Fn_ICON.pm
@@ -75,6 +75,11 @@ sub test_ICON {
     $this->assert_html_equals( $html.$this->{reliconurl}.'/gif.gif" alt="else.gif" />', $t);
     $t = Foswiki::Func::expandCommonVariables('%ICON{"doc"}%');
     $this->assert_html_equals( $html.$this->{reliconurl}.'/doc.gif" alt="doc" />', $t);
+    # SMELL: depends on _filetypes.txt being correct
+    $t = Foswiki::Func::expandCommonVariables(
+        '%ICON{"unknown.tgz" default="argh" alt="bunshop"}%');
+    $this->assert_html_equals(
+        $html.$this->{reliconurl}.'/zip.gif" alt="bunshop" />', $t);
 }
 
 1;
diff --git a/core/lib/Foswiki/Macros/ICON.pm b/core/lib/Foswiki/Macros/ICON.pm
@@ -66,7 +66,7 @@ sub _lookupIcon {
         if ( defined $icon ) {
             # For historical reasons these icons are always .gif files,
             # and can be assumed to exist.
-            $path = $this->{_ICONSPACE}->getPath()."/$ext.gif";
+            $path = $this->{_ICONSPACE}->getPath()."/$icon.gif";
         }
     }