From 68bdab6635c0ecee824630bb34c9152363a2fc76 Mon Sep 17 00:00:00 2001
From: Wojciech Kocjan <wojciech@kocjan.org>
Date: Fri, 5 Apr 2013 12:38:20 +0200
Subject: [PATCH] Post processing of images adds prefix second time when post
 processing a post with one or more images if running with a prefix

---
 lib/cooked_post_processor.rb | 2 +-
 lib/discourse.rb             | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/cooked_post_processor.rb b/lib/cooked_post_processor.rb
index 2cfd7d1652a..d4001ca981a 100644
--- a/lib/cooked_post_processor.rb
+++ b/lib/cooked_post_processor.rb
@@ -45,7 +45,7 @@ class CookedPostProcessor
 
     images.each do |img|
       src = img['src']
-      src = Discourse.base_url + src if src[0] == "/"
+      src = Discourse.base_url_no_prefix + src if src[0] == "/"
 
       if src.present? && (img['width'].blank? || img['height'].blank?)
 
diff --git a/lib/discourse.rb b/lib/discourse.rb
index b1b2b9cc620..54a0d8623c3 100644
--- a/lib/discourse.rb
+++ b/lib/discourse.rb
@@ -26,7 +26,7 @@ module Discourse
     end
   end
 
-  def self.base_url
+  def self.base_url_no_prefix
     protocol = "http"
     protocol = "https" if SiteSetting.use_ssl?
     if SiteSetting.force_hostname.present?
@@ -35,10 +35,13 @@ module Discourse
       result = "#{protocol}://#{current_hostname}"
     end
     result << ":#{SiteSetting.port}" if SiteSetting.port.present? && SiteSetting.port.to_i > 0
-    result << ActionController::Base.config.relative_url_root if !ActionController::Base.config.relative_url_root.blank?
     result
   end
 
+  def self.base_url
+    return base_url_no_prefix + base_uri
+  end
+
   def self.enable_maintenance_mode
     $redis.set maintenance_mode_key, 1
     true