Merge branch 'develop' into pr/new-config-format

Conflicts:
	classes/context/Context.class.php
This commit is contained in:
Kijin Sung 2016-02-05 19:37:10 +09:00
commit 5afefc063c
42 changed files with 435 additions and 58 deletions

View file

@ -233,6 +233,12 @@ class Context
$this->_setRequestArgument();
$this->_setUploadedArgument();
if(isset($_POST['_rx_ajax_compat']) && $_POST['_rx_ajax_compat'] === 'XMLRPC')
{
self::$_instance->request_method = 'XMLRPC';
self::$_instance->response_method = 'JSON';
}
// Load system configuration.
$this->loadDBInfo();