diff options
| author | Ernie Miller <ernie@metautonomo.us> | 2011-05-24 11:09:59 -0400 |
|---|---|---|
| committer | Ernie Miller <ernie@metautonomo.us> | 2011-05-24 11:09:59 -0400 |
| commit | 15baa498710abe5914ae6938827df717696868b8 (patch) | |
| tree | c3bece3ed187a48c8993201d88cec997bfcbc4d8 | |
| parent | 67e12eb3780cb1265671406ff742a0b0cd0d82b4 (diff) | |
| download | rails-15baa498710abe5914ae6938827df717696868b8.tar.gz rails-15baa498710abe5914ae6938827df717696868b8.tar.bz2 rails-15baa498710abe5914ae6938827df717696868b8.zip | |
Redundant condition in compute_asset_host is redundant.
| -rw-r--r-- | actionpack/lib/action_view/helpers/asset_paths.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_view/helpers/asset_paths.rb b/actionpack/lib/action_view/helpers/asset_paths.rb index 38810eea2e..1bc5c9e003 100644 --- a/actionpack/lib/action_view/helpers/asset_paths.rb +++ b/actionpack/lib/action_view/helpers/asset_paths.rb @@ -55,11 +55,11 @@ module ActionView # Pick an asset host for this source. Returns +nil+ if no host is set, # the host if no wildcard is set, the host interpolated with the # numbers 0-3 if it contains <tt>%d</tt> (the number is the source hash mod 4), - # or the value returned from invoking the proc if it's a proc or the value from - # invoking call if it's an object responding to call. + # or the value returned from invoking call on an object responding to call + # (proc or otherwise). def compute_asset_host(source) if host = config.asset_host - if host.is_a?(Proc) || host.respond_to?(:call) + if host.respond_to?(:call) case host.is_a?(Proc) ? host.arity : host.method(:call).arity when 2 request = controller.respond_to?(:request) && controller.request |