Friendpaste

--- Revision None
+++ Revision 383330663132
@@ -0,0 +1,22 @@
+diff --git a/src/couchdb/couch_auth_cache.erl b/src/couchdb/couch_auth_cache.erl
+index 94adac8..ff66dfb 100644
+--- a/src/couchdb/couch_auth_cache.erl
++++ b/src/couchdb/couch_auth_cache.erl
+@@ -293,7 +293,7 @@ refresh_entry(Db, #doc_info{high_seq = DocSeq} = DocInfo) ->
+ user_creds(#doc{deleted = true}) ->
+     nil;
+ user_creds(#doc{} = Doc) ->
+-    {Creds} = couch_query_servers:json_doc(Doc),
++    {Creds} = couch_doc:to_json_obj(Doc, []),
+     Creds.
+ 
+ 
+@@ -360,7 +360,7 @@ get_user_props_from_db(UserName) ->
+             DocId = <<"org.couchdb.user:", UserName/binary>>,
+             try
+                 {ok, Doc} = couch_db:open_doc(Db, DocId, [conflicts]),
+-                {DocProps} = couch_query_servers:json_doc(Doc),
++                {DocProps} = couch_doc:to_json_obj(Doc, []),
+                 DocProps
+             catch
+             _:_Error ->
a	b
	0	+	diff --git a/src/couchdb/couch_auth_cache.erl b/src/couchdb/couch_auth_cache.erl
	0	+	index 94adac8..ff66dfb 100644
	0	+	--- a/src/couchdb/couch_auth_cache.erl
	0	+	+++ b/src/couchdb/couch_auth_cache.erl
	0	+	@@ -293,7 +293,7 @@ refresh_entry(Db, #doc_info{high_seq = DocSeq} = DocInfo) ->
	0	+	user_creds(#doc{deleted = true}) ->
	0	+	nil;
	0	+	user_creds(#doc{} = Doc) ->
	0	+	- {Creds} = couch_query_servers:json_doc(Doc),
	0	+	+ {Creds} = couch_doc:to_json_obj(Doc, []),
	0	+	Creds.
	0	+
	0	+
	0	+	@@ -360,7 +360,7 @@ get_user_props_from_db(UserName) ->
	0	+	DocId = <<"org.couchdb.user:", UserName/binary>>,
	0	+	try
	0	+	{ok, Doc} = couch_db:open_doc(Db, DocId, [conflicts]),
	0	+	- {DocProps} = couch_query_servers:json_doc(Doc),
	0	+	+ {DocProps} = couch_doc:to_json_obj(Doc, []),
	0	+	DocProps
	0	+	catch
	0	+	_:_Error ->
...