#680 merge hotfix/1.7.4.2

This commit is contained in:
akasima 2014-05-01 10:22:57 +09:00
commit f2c4a3bf3b
3 changed files with 69 additions and 13 deletions

View file

@ -205,6 +205,9 @@ class Context
$this->context->lang = &$GLOBALS['lang'];
$this->context->_COOKIE = $_COOKIE;
// 20140429 editor/image_link
$this->_checkGlobalVars();
$this->setRequestMethod('');
$this->_setXmlRpcArgument();
@ -1115,6 +1118,16 @@ class Context
($self->request_method = $_SERVER['REQUEST_METHOD']);
}
/**
* handle global arguments
*
* @return void
*/
function _checkGlobalVars()
{
$this->_recursiveCheckVar($_SERVER['HTTP_HOST']);
}
/**
* handle request areguments for GET/POST
*