diff options
| author | Tom Christie | 2014-11-07 10:14:03 +0000 |
|---|---|---|
| committer | Tom Christie | 2014-11-07 10:14:03 +0000 |
| commit | 555930ee81c21f02fb7f44119a0a35dc4f7c048a (patch) | |
| tree | f1107b56abdc8a4e0698e2eff231ef501a520065 /rest_framework | |
| parent | 9b19b5a59485c9dad4a18538a8a86f1ae4ea2a55 (diff) | |
| parent | 9078fd4f689717aef7feecde7e7692d87050c611 (diff) | |
| download | django-rest-framework-555930ee81c21f02fb7f44119a0a35dc4f7c048a.tar.bz2 | |
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
Diffstat (limited to 'rest_framework')
| -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) |