From 7f9398774383afa5e6914cc272d2cc76e1e95dd6 Mon Sep 17 00:00:00 2001
From: Jan Lehnardt <jan@apache.org>
Date: Sat, 28 Mar 2009 21:02:41 +0000
Subject: always load _conflicts in _show functions

git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@759588 13f79535-47bb-0310-9956-ffa450edef68
---
 src/couchdb/couch_httpd_show.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

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
-- 
cgit v1.2.3