fix recursing usermeta

ncb000gt · Feb 14, 2011 · 26e3a5d · 26e3a5d
1 parent d740c65
commit 26e3a5d
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/meta.coffee b/src/meta.coffee
@@ -92,7 +92,9 @@ class Meta
     # ensure links is an array
     options.links = [options.links] if options?.links and not Array.isArray(options.links)
 
-    @usermeta = Utils.mixin true, {}, defaults, this, options
+    @usermeta = options?.usermeta or {} # get previous usermeta
+    @usermeta = Utils.mixin true, @usermeta, defaults, this, options
+    delete @usermeta.usermeta # remove old, mixed-in usermeta
 
     props = Utils.uniq Meta.riakProperties
       .concat(additionalProperties)