diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-05-01 14:05:55 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-05-01 14:05:55 -0700 |
| commit | f122ca58745f6218cb531fb683b97686254fea5d (patch) | |
| tree | 07a539e7194dc757cee86895c581461a293dc4ef /activesupport/lib/active_support | |
| parent | e931394d098714c6a4cbb91b8c8c00bd9d6fb850 (diff) | |
| download | rails-f122ca58745f6218cb531fb683b97686254fea5d.tar.gz rails-f122ca58745f6218cb531fb683b97686254fea5d.tar.bz2 rails-f122ca58745f6218cb531fb683b97686254fea5d.zip | |
Ruby 1.9 compat: don't shadow local with block var
Diffstat (limited to 'activesupport/lib/active_support')
| -rw-r--r-- | activesupport/lib/active_support/vendor/memcache-client-1.5.0/memcache.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/activesupport/lib/active_support/vendor/memcache-client-1.5.0/memcache.rb b/activesupport/lib/active_support/vendor/memcache-client-1.5.0/memcache.rb index 375cfb1430..dda7f2c30e 100644 --- a/activesupport/lib/active_support/vendor/memcache-client-1.5.0/memcache.rb +++ b/activesupport/lib/active_support/vendor/memcache-client-1.5.0/memcache.rb @@ -278,12 +278,12 @@ class MemCache results = {} - server_keys.each do |server, keys| - keys = keys.join ' ' + server_keys.each do |server, keys_for_server| + keys_for_server = keys_for_server.join ' ' values = if @multithread then - threadsafe_cache_get_multi server, keys + threadsafe_cache_get_multi server, keys_for_server else - cache_get_multi server, keys + cache_get_multi server, keys_for_server end values.each do |key, value| results[cache_keys[key]] = Marshal.load value |