fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-08 03:01:43 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into pr/own-comments

Browse source
This commit is contained in:
Kijin Sung 2017-02-11 14:28:45 +09:00
commit 4b342a2d9c
5 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/file/file.controller.php
View file

@ -699,6 +699,10 @@ class fileController extends file
*/
function setUploadInfo($editor_sequence, $upload_target_srl=0)
{
if(!isset($_SESSION['upload_info']) || !is_array($_SESSION['upload_info']))
{
$_SESSION['upload_info'] = array();
}
if(!isset($_SESSION['upload_info'][$editor_sequence]))
{
$_SESSION['upload_info'][$editor_sequence] = new stdClass();

9
modules/member/member.controller.php
View file

@ -2637,14 +2637,9 @@ class memberController extends member
*/
function destroySessionInfo()
{
if(!$_SESSION || !is_array($_SESSION)) return;
$memberInfo = Context::get('logged_info');
$memberSrl = $memberInfo->member_srl;
foreach($_SESSION as $key => $val)
if (!Rhymix\Framework\Session::isStarted())
{
$_SESSION[$key] = '';
return;
}
Rhymix\Framework\Session::destroy();