diff options
Diffstat (limited to 'vendor')
3 files changed, 3 insertions, 4 deletions
diff --git a/vendor/gems/routing-filter-0.2.3/lib/routing_filter/adapters/rails_2.rb b/vendor/gems/routing-filter-0.2.3/lib/routing_filter/adapters/rails_2.rb index f80910b96..9463ede19 100644 --- a/vendor/gems/routing-filter-0.2.3/lib/routing_filter/adapters/rails_2.rb +++ b/vendor/gems/routing-filter-0.2.3/lib/routing_filter/adapters/rails_2.rb @@ -15,7 +15,7 @@ ActionController::Routing::RouteSet::NamedRouteCollection.class_eval do if match = code.match(%r(^return (.*) if (.*))) # returned string must not contain newlines, or we'll spill out of inline code comments in # ActionController::Routing::RouteSet::NamedRouteCollection#define_url_helper - "returning(#{match[1]}) { |result|" + + "#{match[1]}.tap { |result|" + " ActionController::Routing::Routes.filters.run(:around_generate, *args, &lambda{ result }) " + "} if #{match[2]}" end diff --git a/vendor/gems/routing-filter-0.2.3/lib/routing_filter/filter.rb b/vendor/gems/routing-filter-0.2.3/lib/routing_filter/filter.rb index 1ec5c4867..4fbdad9ec 100644 --- a/vendor/gems/routing-filter-0.2.3/lib/routing_filter/filter.rb +++ b/vendor/gems/routing-filter-0.2.3/lib/routing_filter/filter.rb @@ -34,4 +34,4 @@ module RoutingFilter url.sub!(%r(/?($|\?))) { "/#{segment}#{$1}" } end end -end
\ No newline at end of file +end diff --git a/vendor/gems/routing-filter-0.2.3/lib/routing_filter/filters/locale.rb b/vendor/gems/routing-filter-0.2.3/lib/routing_filter/filters/locale.rb index 74e07968f..4016a09f4 100644 --- a/vendor/gems/routing-filter-0.2.3/lib/routing_filter/filters/locale.rb +++ b/vendor/gems/routing-filter-0.2.3/lib/routing_filter/filters/locale.rb @@ -55,12 +55,11 @@ module RoutingFilter def around_generate(*args, &block) params = args.extract_options! # this is because we might get a call like forum_topics_path(forum, topic, :locale => :en) - locale = params.delete(:locale) # extract the passed :locale option + locale = params.delete(:locale) # extract the tpassed :locale option locale = I18n.locale if locale.nil? # default to I18n.locale when locale is nil (could also be false) locale = nil unless valid_locale?(locale) # reset to no locale when locale is not valid args << params - yield.tap do |result| prepend_segment!(result, locale) if prepend_locale?(locale) end |