Merge branch 'master' of github.com:web2py/web2py

2013-03-10 15:58:24 -05:00
parent a42fb6b558 eac9768549
commit a23f4c5c88
1 changed files with 2 additions and 2 deletions
@@ -4405,9 +4405,9 @@ class Service(object):

        
            
+        request = current.request
+        response = current.response
        if not data:
-            request = current.request
-            response = current.response
            response.headers['Content-Type'] = 'application/json; charset=utf-8'
            try:
                data = json_parser.loads(request.body.read())