Reinstate main_url and admin_url helpers with deprecation warning

1 files changed, 26 insertions, 0 deletions

diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb
index ea12fbb5c..cd60ba5ef 100755
--- a/app/helpers/link_to_helper.rb
+++ b/app/helpers/link_to_helper.rb
@@ -244,6 +244,32 @@ module LinkToHelper
         link_to h(query), search_url(query)
     end
 
+    # Deprecated helper
+    # TODO: Remove in next release
+    def admin_url(relative_path)
+        warn "[DEPRECATION] admin_url is deprecated. Please remove it from your theme."
+        relative_path
+    end
+
+    # Deprecated helper
+    # TODO: Remove in next release
+    def main_url(relative_path, append = nil)
+        warn "[DEPRECATION] main_url is deprecated. Please remove it from your theme."
+        url_prefix = "http://" + Configuration::domain
+        url = url_prefix + relative_path
+        if !append.nil?
+            begin
+                env = Rack::MockRequest.env_for(url)
+                req = Rack::Request.new(env)
+                req.path_info += append
+                url = req.url
+            rescue URI::InvalidURIError
+                # don't append to it
+            end
+        end
+        return url
+    end
+
     # About page URLs
     def about_url
         return help_general_url(:action => 'about')