diff options
| author | Robin Houston <robin@lenny.robin> | 2011-07-14 03:07:52 +0100 |
|---|---|---|
| committer | Robin Houston <robin@lenny.robin> | 2011-07-14 03:07:52 +0100 |
| commit | 1e309c29fb2d61fbdf27ad546ad4ae9c008a2f0c (patch) | |
| tree | 110fa6c8b736d0f2ab2c73531e7eab6bf65c7c04 | |
| parent | 45c826821c7f9273158e7f94722ab88434defee6 (diff) | |
| parent | ef95d5a730498bccd4dd19b0531e510c6c9461e0 (diff) | |
Merge branch 'master' into wdtk
| -rw-r--r-- | app/models/incoming_message.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/incoming_message.rb b/app/models/incoming_message.rb index 0ad668afb..581c73f8b 100644 --- a/app/models/incoming_message.rb +++ b/app/models/incoming_message.rb @@ -1146,7 +1146,7 @@ class IncomingMessage < ActiveRecord::Base # recurse into zip files begin zip_file = Zip::ZipFile.open(tempfile.path) - text += _get_attachment_text_from_zip_file(zip_file) + text += IncomingMessage._get_attachment_text_from_zip_file(zip_file) zip_file.close() rescue $stderr.puts("Error processing zip file: #{$!.inspect}") @@ -1157,7 +1157,7 @@ class IncomingMessage < ActiveRecord::Base return text end - def _get_attachment_text_from_zip_file(zip_file) + def IncomingMessage._get_attachment_text_from_zip_file(zip_file) text = "" for entry in zip_file if entry.file? |