Merge branch 'master' of github.com:r888888888/danbooru

2013-02-23 11:40:08 -05:00
parent 402f13e202 1755a1671f
commit f2bdd7557f
4 changed files with 40 additions and 4 deletions
--- a/app/models/upload.rb
+++ b/app/models/upload.rb
@@ -247,7 +247,7 @@ class Upload < ActiveRecord::Base
  module DownloaderMethods
    # Determines whether the source is downloadable
    def is_downloadable?
-      source =~ /^http:\/\// && file_path.blank?
+      source =~ /^https?:\/\// && file_path.blank?
    end

    # Downloads the file to destination_path