From 84756f889aab795c5ae004f6532353436531c8fb Mon Sep 17 00:00:00 2001
From: Jacques Distler <distler@golem.ph.utexas.edu>
Date: Sat, 20 Dec 2008 20:39:38 +0000
Subject: [PATCH] Fix bug #17978.

---
 lib/url_generator.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/url_generator.rb b/lib/url_generator.rb
index b5415e63..d140fd82 100644
--- a/lib/url_generator.rb
+++ b/lib/url_generator.rb
@@ -94,6 +94,8 @@ class UrlGenerator < AbstractUrlGenerator
   end
 
   def pic_link(mode, name, text, web_address, known_pic)
+    href = @controller.url_for :controller => 'file', :web => web_address, :action => 'file',
+      :id => name
     case mode
     when :export
       if known_pic 
@@ -103,13 +105,11 @@ class UrlGenerator < AbstractUrlGenerator
       end
     when :publish
       if known_pic 
-        %{<img alt="#{text}" src="#{CGI.escape(name)}" />}
+        %{<img alt="#{text}" src="#{href}" />}
       else 
         %{<span class="newWikiWord">#{text}</span>} 
       end
     else 
-      href = @controller.url_for :controller => 'file', :web => web_address, :action => 'file', 
-          :id => name
       if known_pic 
         %{<img alt="#{text}" src="#{href}" />}
       else