couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rnew...@apache.org
Subject couch-mrview commit: updated refs/heads/master to a5411c0
Date Tue, 06 May 2014 22:27:35 GMT
Repository: couchdb-couch-mrview
Updated Branches:
  refs/heads/master 01cff34df -> a5411c09f


Fix references to couch_config


Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/commit/a5411c09
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/tree/a5411c09
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/diff/a5411c09

Branch: refs/heads/master
Commit: a5411c09f1d3cb3cf8f6c161c75967f83e0a0eec
Parents: 01cff34
Author: Robert Newson <rnewson@apache.org>
Authored: Tue May 6 23:22:47 2014 +0100
Committer: Robert Newson <rnewson@apache.org>
Committed: Tue May 6 23:23:41 2014 +0100

----------------------------------------------------------------------
 src/couch_mrview_http.erl | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/a5411c09/src/couch_mrview_http.erl
----------------------------------------------------------------------
diff --git a/src/couch_mrview_http.erl b/src/couch_mrview_http.erl
index fc0a143..a5ba68f 100644
--- a/src/couch_mrview_http.erl
+++ b/src/couch_mrview_http.erl
@@ -124,12 +124,12 @@ all_docs_req(Req, Db, Keys) ->
             do_all_docs_req(Req, Db, Keys);
         _ ->
             DbName = ?b2l(Db#db.name),
-            case couch_config:get("couch_httpd_auth",
+            case config:get("couch_httpd_auth",
                                   "authentication_db",
                                   "_users") of
             DbName ->
-                UsersDbPublic = couch_config:get("couch_httpd_auth", "users_db_public", "false"),
-                PublicFields = couch_config:get("couch_httpd_auth", "public_fields"),
+                UsersDbPublic = config:get("couch_httpd_auth", "users_db_public", "false"),
+                PublicFields = config:get("couch_httpd_auth", "public_fields"),
                 case {UsersDbPublic, PublicFields} of
                 {"true", PublicFields} when PublicFields =/= undefined ->
                     do_all_docs_req(Req, Db, Keys);
@@ -155,9 +155,9 @@ do_all_docs_req(Req, Db, Keys) ->
     {ok, Resp} = couch_httpd:etag_maybe(Req, fun() ->
         VAcc0 = #vacc{db=Db, req=Req},
         DbName = ?b2l(Db#db.name),
-        UsersDbName = couch_config:get("couch_httpd_auth",
-                                         "authentication_db",
-                                         "_users"),
+        UsersDbName = config:get("couch_httpd_auth",
+                                 "authentication_db",
+                                 "_users"),
         IsAdmin = is_admin(Db),
         Callback = get_view_callback(DbName, UsersDbName, IsAdmin),
         couch_mrview:query_all_docs(Db, Args, Callback, VAcc0)


Mime
View raw message