@@ -411,7 +411,8 @@ class Merb::AbstractController uri = Merb::Config[:path_prefix] + uri if Merb::Config[:path_prefix] uri end - + alias_method :relative_url, :url + # ==== Parameters # name<~to_sym, Hash>:: The name of the URL to generate. # rparams<Hash>:: Parameters for the route generation. @@ -422,10 +423,10 @@ class Merb::AbstractController # ==== Alternatives # If a hash is used as the first argument, a default route will be # generated based on it and rparams. - def url_with_host(name, rparams={}) - uri = request.protocol + request.host + url(name, rparams) + def absolute_url(name, rparams={}) + request.protocol + request.host + url(name, rparams) end - + private # ==== Parameters # filters<Array[Filter]>:: The filter list that this should be added to. @@ -527,4 +528,4 @@ class Merb::AbstractController return @_merb_partial_locals[sym] if @_merb_partial_locals && @_merb_partial_locals.key?(sym) super end -end \ No newline at end of file +end lib/merb-core/controller/abstract_controller.rb b6b9b4a3477901c83752028df9252d6f4d8561e7 Michael D. Ivey ivey@gweezlebur.com http://github.com/wycats/merb-core/commit/9858e69815a3a92ca72129c90bdb2442d5e8d879 9858e69815a3a92ca72129c90bdb2442d5e8d879 2008-03-22T08:42:57-07:00 2008-03-22T08:42:57-07:00 Rename url_with_host to absolute_url Also add alias relative_url for url 66ac56d824641ae940fee9c56090e424809c8b18 Michael D. Ivey ivey@gweezlebur.com