From 1f816af24b11803aaa894cc1ad1d8482630a3471 Mon Sep 17 00:00:00 2001
From: Jacques Distler <distler@golem.ph.utexas.edu>
Date: Sat, 20 Dec 2008 13:56:50 -0600
Subject: [PATCH] Uploaded Pictures Should Display in "Published" Mode

---
 lib/url_generator.rb                    | 6 +++---
 test/functional/file_controller_test.rb | 7 +++++++
 test/test_helper.rb                     | 2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/lib/url_generator.rb b/lib/url_generator.rb
index 9eb44cd8..44bac253 100644
--- a/lib/url_generator.rb
+++ b/lib/url_generator.rb
@@ -105,6 +105,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 
@@ -114,13 +116,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 
diff --git a/test/functional/file_controller_test.rb b/test/functional/file_controller_test.rb
index d4c82b8c..07658ca4 100755
--- a/test/functional/file_controller_test.rb
+++ b/test/functional/file_controller_test.rb
@@ -104,6 +104,13 @@ class FileControllerTest < Test::Unit::TestCase
                       :description => 'Rails, end-to-end'}
     assert @web.has_file?('rails-e2e.gif')
     assert_equal(picture, WikiFile.find_by_file_name('rails-e2e.gif').content)
+    PageRenderer.setup_url_generator(StubUrlGenerator.new)
+    @wiki.revise_page('wiki1', 'HomePage', 'Try [[rails-e2e.gif:pic]] again.',
+        Time.now, 'AnonymousBrave', renderer)
+    assert_equal "<p>Try <img alt='Rails, end-to-end' src='../file/rails-e2e.gif'/> again.</p>",
+        renderer.display_content
+    assert_equal "<p>Try <img alt='Rails, end-to-end' src='../file/rails-e2e.gif'/> again.</p>",
+        renderer.display_published
   end
 
   def test_import
diff --git a/test/test_helper.rb b/test/test_helper.rb
index aa0cf1d1..24e61033 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -154,7 +154,7 @@ class StubUrlGenerator < AbstractUrlGenerator
       if known_pic then %{<img alt="#{text}" src="#{link}" />}
       else %{<img alt="#{text}" src="no image" />} end
     when :publish
-      if known_pic then %{<img alt="#{text}" src="#{link}" />}
+      if known_pic then %{<img alt="#{text}" src="../file/#{link}" />}
       else %{<span class="newWikiWord">#{text}</span>} end
     else 
       if known_pic then %{<img alt="#{text}" src="../file/#{link}" />}