fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-29 15:22:15 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'hotfix/1.7.7.2' into develop

Browse source
This commit is contained in:
bnu 2014-10-02 10:47:06 +09:00
commit 7167de7b88
6 changed files with 14 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

8
classes/context/Context.class.php
View file

@ -1295,14 +1295,16 @@ class Context
}
else
{
$result[$k] = $v;
if($do_stripslashes && version_compare(PHP_VERSION, '5.9.0', '<') && get_magic_quotes_gpc())
{
$v = stripslashes($v);
$result[$k] = stripslashes($result[$k]);
}
if(!is_array($v))
if(!is_array($result[$k]))
{
$result[$k] = trim($v);
$result[$k] = trim($result[$k]);
}
}
}

2
classes/module/ModuleHandler.class.php
View file

@ -383,8 +383,6 @@ class ModuleHandler extends Handler
if($kind == 'admin')
{
$oMemberController = ModuleHandler::getModuleInstance('member', 'controller');
$validate_session = $oMemberController->validateSession();
$oMemberController->regenerateSession();
if(!$validate_session)
{
$this->error = 'security_invalid_session';