Changeset 5810 for trunk/core/lib/Foswiki/Attach.pm

Timestamp:

12/17/09 19:28:55 (2 years ago)

Author:

CrawfordCurrie

Message:

Item2511: split macros out of the Foswiki.pm monster

File:

• trunk/core/lib/Foswiki/Attach.pm (modified) (4 diffs)

trunk/core/lib/Foswiki/Attach.pm

@@ -13 +13 @@
 use strict;
 use Assert;
+
+our $MARKER = "\0";
 
 =begin TML
@@ -143 +145 @@
 
     $row =~ s/%A_(\w+)%/_expandAttrs( $this, $1, $topicObject, $info)/ge;
-    $row =~ s/$Foswiki::TranslationToken/%/go;
+    $row =~ s/$MARKER/%/go;
 
     return $row;
@@ -159 +161 @@
     }
     elsif ( $attr eq 'ICON' ) {
-        my $picked = $this->{session}->mapToIconFileName($file);
-        if (!defined($picked) || ($picked eq '')) {
-            return '';
-        }
-        my $url = $this->{session}->getIconUrl( 0, $picked );
-        return CGI::img(
-            {
-                src    => $url,
-                width  => 16,
-                height => 16,
-                align  => 'top',
-                alt    => $picked || '',
-                border => 0
-            }
-        );
+        return '%ICON{"'.$file.'" alt="else"}%';
     }
     elsif ( $attr eq 'EXT' ) {
@@ -240 +228 @@
     }
     else {
-        return $Foswiki::TranslationToken . 'A_' . $attr
-          . $Foswiki::TranslationToken;
+        return $MARKER . 'A_' . $attr . $MARKER;
     }
 }