switch order of argument fetching around

praekeltfoundation · Apr 11, 2014 · 114bd60 · 114bd60
1 parent 7ef134d
commit 114bd60
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/vumi/transports/mxit/mxit.py b/vumi/transports/mxit/mxit.py
@@ -121,12 +121,16 @@ def get_request_data(self, request):
         return data
 
     def get_request_content(self, request):
+        headers = request.requestHeaders
+        [content] = headers.getRawHeaders('X-Mxit-User-Input', [None])
+        if content:
+            return unquote_plus(content)
+
         if request.args and 'input' in request.args:
             [content] = request.args['input']
-        else:
-            headers = request.requestHeaders
-            [content] = headers.getRawHeaders('X-Mxit-User-Input', [None])
-        return (None if content is None else unquote_plus(content))
+            return content
+
+        return None
 
     def handle_raw_inbound_message(self, msg_id, request):
         if not self.is_mxit_request(request):