Merge pull request #2379 from Robsteranium/patch-1

guid default of "" never gets set to a secure random hex (in mysql at least)
2011-12-02 10:47:24 -08:00 · 2011-12-02 10:47:24 -08:00 · 8212268b99
commit 8212268b99
parent 71354a1673 08b23d3a7f
1 changed files with 1 additions and 1 deletions
--- a/lib/diaspora/guid.rb
+++ b/lib/diaspora/guid.rb
@ -9,6 +9,6 @@ module Diaspora::Guid

  # @return [String] The model's guid.
  def set_guid
-    self.guid ||= ActiveSupport::SecureRandom.hex(8)
+    self.guid = ActiveSupport::SecureRandom.hex(8) if self.guid.blank?
  end
 end