From 25585d89edf76e2b1e2c85d7f39d7d942d65a66d Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Wed, 20 Jan 2016 16:36:48 +0900
Subject: [PATCH] Make Context::setRequestMethod() easier to read

---
 classes/context/Context.class.php | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index 484e891ce..9c4b327b1 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -1275,12 +1275,27 @@ class Context
 	public static function setRequestMethod($type = '')
 	{
 		self::$_instance->js_callback_func = self::$_instance->getJSCallbackFunc();
-
-		($type && self::$_instance->request_method = $type) or
-				((strpos($_SERVER['CONTENT_TYPE'], 'json') || strpos($_SERVER['HTTP_CONTENT_TYPE'], 'json')) && self::$_instance->request_method = 'JSON') or
-				($GLOBALS['HTTP_RAW_POST_DATA'] && self::$_instance->request_method = 'XMLRPC') or
-				(self::$_instance->js_callback_func && self::$_instance->request_method = 'JS_CALLBACK') or
-				(self::$_instance->request_method = $_SERVER['REQUEST_METHOD']);
+		
+		if ($type)
+		{
+			self::$_instance->request_method = $type;
+		}
+		elseif (strpos($_SERVER['CONTENT_TYPE'], 'json') !== false || strpos($_SERVER['HTTP_CONTENT_TYPE'], 'json') !== false)
+		{
+			self::$_instance->request_method = 'JSON';
+		}
+		elseif ($GLOBALS['HTTP_RAW_POST_DATA'])
+		{
+			self::$_instance->request_method = 'XMLRPC';
+		}
+		elseif (self::$_instance->js_callback_func)
+		{
+			self::$_instance->request_method = 'JS_CALLBACK';
+		}
+		else
+		{
+			self::$_instance->request_method = $_SERVER['REQUEST_METHOD'];
+		}
 	}
 
 	/**