Download as
Browse Code »

Commit abd49391a412798ce38842002e531fce77c82a67

Authored by Antonio Terceiro
1 parent e33fa43b
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

ruby1.9: fix Ruby 1.9-incompatible vendored code 

Having this vendored code at all sucks
Showing 2 changed files with 3 additions and 4 deletions   Show diff stats
vendor/cardmagic-contacts-f66219e6589ccaf3ab9e3574fdd41225d0dd5073/lib/contacts/base.rb
  Diff comments   View file @abd4939
@@ -167,14 +167,14 @@ class Contacts @@ -167,14 +167,14 @@ class Contacts
167 167
168 def uncompress(resp, data) 168 def uncompress(resp, data)
169 case resp.response['content-encoding'] 169 case resp.response['content-encoding']
170 - when 'gzip': 170 + when 'gzip'
171 gz = Zlib::GzipReader.new(StringIO.new(data)) 171 gz = Zlib::GzipReader.new(StringIO.new(data))
172 data = gz.read 172 data = gz.read
173 gz.close 173 gz.close
174 resp.response['content-encoding'] = nil 174 resp.response['content-encoding'] = nil
175 # FIXME: Not sure what Hotmail was feeding me with their 'deflate', 175 # FIXME: Not sure what Hotmail was feeding me with their 'deflate',
176 # but the headers definitely were not right 176 # but the headers definitely were not right
177 - when 'deflate': 177 + when 'deflate'
178 data = Zlib::Inflate.inflate(data) 178 data = Zlib::Inflate.inflate(data)
179 resp.response['content-encoding'] = nil 179 resp.response['content-encoding'] = nil
180 end 180 end
vendor/gdata-1.1.1/lib/gdata.rb
  Diff comments   View file @abd4939
@@ -18,5 +18,4 @@ require 'gdata/http' @@ -18,5 +18,4 @@ require 'gdata/http'
18 require 'gdata/client' 18 require 'gdata/client'
19 require 'gdata/auth' 19 require 'gdata/auth'
20 # This is for Unicode "support" 20 # This is for Unicode "support"
21 -require 'jcode'  
22 -$KCODE = 'UTF8'  
23 \ No newline at end of file 21 \ No newline at end of file
  22 +$KCODE = 'UTF8'