From c57d80d2a0982653fa856a306ff2f6565dcdf00e Mon Sep 17 00:00:00 2001
From: Mihail Burduja <warchildmd@gmail.com>
Date: Tue, 19 Aug 2014 00:09:51 +0300
Subject: [PATCH] Removed MEDIA_URL from django-rest-framework settings. Using
 Django's MEDIA_URL

---
 rest_framework/fields.py   | 2 +-
 rest_framework/settings.py | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index d45a74f7f..144cfb6df 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -974,7 +974,7 @@ class FileField(WritableField):
 
     def to_native(self, value):
         if api_settings.PREPEND_MEDIA_URL:
-            return api_settings.MEDIA_URL + value.name
+            return settings.MEDIA_URL + value.name
         return value.name
 
 
diff --git a/rest_framework/settings.py b/rest_framework/settings.py
index e524141e0..d47ec15dd 100644
--- a/rest_framework/settings.py
+++ b/rest_framework/settings.py
@@ -122,7 +122,6 @@ DEFAULTS = {
     
     # Prepending MEDIA_URL to FileField
     'PREPEND_MEDIA_URL': False,
-    'MEDIA_URL': '/',
 }