diff options
| author | Jan Lehnardt <jan@apache.org> | 2009-03-28 21:02:41 +0000 |
|---|---|---|
| committer | Jan Lehnardt <jan@apache.org> | 2009-03-28 21:02:41 +0000 |
| commit | 7f9398774383afa5e6914cc272d2cc76e1e95dd6 (patch) | |
| tree | 74a9e5ac72430ec646f2f55b359acb069cd75a59 /src/couchdb | |
| parent | 6b53d12b758b8e917a92e9d34eb59aa575d000b7 (diff) | |
always load _conflicts in _show functions
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@759588 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/couchdb')
| -rw-r--r-- | src/couchdb/couch_httpd_show.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/couchdb/couch_httpd_show.erl b/src/couchdb/couch_httpd_show.erl index dd337ced..5aed8971 100644 --- a/src/couchdb/couch_httpd_show.erl +++ b/src/couchdb/couch_httpd_show.erl @@ -30,7 +30,7 @@ handle_doc_show_req(#httpd{ #doc{body={Props}} = couch_httpd_db:couch_doc_open(Db, DesignId, nil, []), Lang = proplists:get_value(<<"language">>, Props, <<"javascript">>), ShowSrc = get_nested_json_value({Props}, [<<"shows">>, ShowName]), - Doc = try couch_httpd_db:couch_doc_open(Db, DocId, nil, []) of + Doc = try couch_httpd_db:couch_doc_open(Db, DocId, nil, [conflicts]) of FoundDoc -> FoundDoc catch _ -> nil |