diff options
| author | Tom Christie | 2014-11-06 17:37:52 +0000 |
|---|---|---|
| committer | Tom Christie | 2014-11-06 17:37:52 +0000 |
| commit | a40b805963c40e0e7f2aaa679f18fa2e5e96419b (patch) | |
| tree | 28c9fccf0e4ba58bafe4fdd00da27d7509843523 | |
| parent | db1dd8e2406bf54a82d154babd360fba52a0d4bc (diff) | |
| parent | ea76dc18b6770aefcc53a6c5752674c2fff0ddcf (diff) | |
| download | django-rest-framework-a40b805963c40e0e7f2aaa679f18fa2e5e96419b.tar.bz2 | |
Merge pull request #2038 from NextHub/master
Fixed base_url duplication in FileField.use_url
| -rw-r--r-- | rest_framework/fields.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 71377326..95cda2ce 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -1007,7 +1007,7 @@ class FileField(Field): if self.use_url: if not value: return None - url = settings.MEDIA_URL + value.url + url = value.url request = self.context.get('request', None) if request is not None: return request.build_absolute_uri(url) |