Handle the possibility of nil options in PublicAttributesMixin

Should fix osbridge/open-source-bridge-proposals#14
kcomandich · Mar 5, 2014 · 1e2a1f9 · 1e2a1f9
1 parent f957424
commit 1e2a1f9
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/mixins/open_conference_ware/public_attributes_mixin.rb b/app/mixins/open_conference_ware/public_attributes_mixin.rb
@@ -47,7 +47,7 @@ def public_attributes
       end
 
       def serializable_hash(options={})
-        if (options.keys & [:only, :except, :methods, :include]).present?
+        if options && (options.keys & [:only, :except, :methods, :include]).present?
           super(options)
         else
           public_attributes