Changeset 508

Timestamp:

11/10/08 04:10:56 (3 years ago)

Author:

SvenDowideit

Message:

Item124: undefined ICONTOPIC causes crash

Location:

trunk/core/lib

Files:

• TWiki.pm (modified) (2 diffs)
• TWiki/Attach.pm (modified) (1 diff)

trunk/core/lib/TWiki.pm

@@ -1260 +1260 @@
 
     my $iconTopic = $this->{prefs}->getPreferencesValue('ICONTOPIC');
-    my ( $web, $topic ) =
-      $this->normalizeWebTopicName( $this->{webName}, $iconTopic );
-    $iconName =~ s/^.*\.(.*?)$/$1/;
-    return $this->getPubUrl( $absolute, $web, $topic, $iconName . '.gif' );
+    if (defined($iconTopic)) {
+        my ( $web, $topic ) =
+            $this->normalizeWebTopicName( $this->{webName}, $iconTopic );
+        $iconName =~ s/^.*\.(.*?)$/$1/;
+        return $this->getPubUrl( $absolute, $web, $topic, $iconName . '.gif' );
+    } ele {
+        return '';
+    }
 }
 
@@ -1283 +1287 @@
     unless ( $this->{_ICONMAP} ) {
         my $iconTopic = $this->{prefs}->getPreferencesValue('ICONTOPIC');
-        my ( $web, $topic ) =
-          $this->normalizeWebTopicName( $this->{webName}, $iconTopic );
-        local $/ = undef;
-        try {
-            my $icons =
-              $this->{store}
-              ->getAttachmentStream( undef, $web, $topic, '_filetypes.txt' );
-            %{ $this->{_ICONMAP} } = split( /\s+/, <$icons> );
-            close($icons);
-        }
-        catch Error::Simple with {
-            %{ $this->{_ICONMAP} } = ();
-        };
+        if (defined($iconTopic)) {
+            my ( $web, $topic ) =
+              $this->normalizeWebTopicName( $this->{webName}, $iconTopic );
+            local $/ = undef;
+            try {
+                my $icons =
+                  $this->{store}
+                  ->getAttachmentStream( undef, $web, $topic, '_filetypes.txt' );
+                %{ $this->{_ICONMAP} } = split( /\s+/, <$icons> );
+                close($icons);
+            }
+            catch Error::Simple with {
+                %{ $this->{_ICONMAP} } = ();
+            };
+        } else {
+            return $default || $fileName;
+        }
     }
 

trunk/core/lib/TWiki/Attach.pm

@@ -195 +195 @@
     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(