diff options
| author | Adam Kocoloski <kocolosk@apache.org> | 2009-11-21 17:01:50 +0000 |
|---|---|---|
| committer | Adam Kocoloski <kocolosk@apache.org> | 2009-11-21 17:01:50 +0000 |
| commit | 3a4fad07cb5097598eefd0cd7f588c5881a61c8f (patch) | |
| tree | 6945d805eb72a37a5b27ae14a7ec2d1e8690fdac /src/mochiweb/mochiweb_util.erl | |
| parent | a2ebd6155b8171befd8f55b42c48bc563bb330b0 (diff) | |
upgrade mochiweb to r113, use hooks instead of forking mochijson2. COUCHDB-474
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@882941 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/mochiweb/mochiweb_util.erl')
| -rw-r--r-- | src/mochiweb/mochiweb_util.erl | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/mochiweb/mochiweb_util.erl b/src/mochiweb/mochiweb_util.erl index 7bf18d15..73cacea4 100644 --- a/src/mochiweb/mochiweb_util.erl +++ b/src/mochiweb/mochiweb_util.erl @@ -78,7 +78,7 @@ safe_relative_path("", Acc) -> [] -> ""; _ -> - join(lists:reverse(Acc), "/") + string:join(lists:reverse(Acc), "/") end; safe_relative_path(P, Acc) -> case partition(P, "/") of @@ -423,9 +423,7 @@ record_to_proplist(Record, Fields) -> %% Fields should be obtained by calling record_info(fields, record_type) %% where record_type is the record type of Record record_to_proplist(Record, Fields, TypeKey) - when is_tuple(Record), - is_list(Fields), - size(Record) - 1 =:= length(Fields) -> + when tuple_size(Record) - 1 =:= length(Fields) -> lists:zip([TypeKey | Fields], tuple_to_list(Record)). |